commit cd62b7f90637a7d1f38228a38940ef243ec22d72
Merge: 37d6f7f dc6a6bd
Author: Klaus Aehlig <[email protected]>
Date: Fri Jul 11 14:34:35 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Add the list of designs for stable-2.12
Arbitrary MultiMap from all exported Constructors
(9 cherry-picks from master)
* stable-2.11
Remove user-initiated shutdown design from drafts
Improve startup/shutdown in the admin guide
Improve user down documentation
Fix format of NEWS file
Bump revision to 2.11.3
Prepare NEWS file for 2.11.3 release
* stable-2.10
Make gnt-cluster upgrade honor backup-dir
Add a new --with-backup-dir configure option
Fix BlockdevSnapshot in case of non lvm-based disk
Fix RAPI in case split query mechanism is used
Allow disk hot-remove even with chroot or SM
Remove superflous loop in instance queries
Conflicts:
lib/cli.py: trivial
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc doc/design-draft.rst
index eb4e884,4edbed5..17c7429
--- a/doc/design-draft.rst
+++ b/doc/design-draft.rst
@@@ -22,10 -20,7 +20,9 @@@ Design document draft
design-os.rst
design-move-instance-improvements.rst
design-node-security.rst
- design-systemd.rst
design-cpu-speed.rst
+ design-disk-conversion.rst
+ design-ifdown.rst
.. vim: set textwidth=72 :
.. Local Variables:
--
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
