Ottawa council adopts 2.9 per cent increase for all but transit budget