Shortly after taking office two years ago, Gov. Gavin Newsom promised to deliver a massive compromise deal on the water rushing through California’s major rivers and the critically-important Delta — and bring lasting peace to the incessant water war between farmers, cities, anglers and environmentalists.