commit 9c7ca74eff78753a9f186e3e85f2435e73f12386
Merge: 39f2393 de23298
Author: Klaus Aehlig <[email protected]>
Date: Mon Aug 18 13:08:44 2014 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
On upgrades, check for upgrades to resume first
Pause watcher during upgrade
Allow instance disks to be added with --no-wait-for-sync
Signed-off-by: Klaus Aehlig <[email protected]>
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
