Christmas and new year travellers have been spared disruption after a planned strike by fuel tanker drivers at Edinburgh ...