commit 9bad4a7436af4812e75f53b13b6e851335e73ef4
Merge: 2823704 3076e05
Author: Klaus Aehlig <[email protected]>
Date: Mon Aug 18 16:44:15 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Clarify section separation in text format
Fix the documentation for user_shutdown
* stable-2.11
Fix invalid use of RpcResult.Raise
Bump revision to 2.11.5
Prepare NEWS file for 2.11.5 release
Postpone release of 2.11.4 by one day
Remove known issues section for 2.11.4
Add known issue to 2.11.4 NEWS file
Bump version to 2.11.4
Prepare NEWS file for 2.11.4
* stable-2.10
On upgrades, check for upgrades to resume first
Pause watcher during upgrad
Allow instance disks to be added with --no-wait-for-sync
Bump revision to 2.10.7
Prepare NEWS file for 2.10.7 release
Fix lint error
Create the config backup archive in a safe way
Add non-cherry-pickable changes related to state "rb----"
Add Xen nothing state '------'
Add Xen paused state as a Ganeti running state
Update usage string for 'gnt-network connect'
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
