commit 6f96e72b6c771e0f87ac3771dd7b18c538bb4205
Merge: 6c3995d 9f2cce0
Author: Klaus Aehlig <[email protected]>
Date: Mon Jul 27 16:45:26 2015 +0200
Merge branch 'stable-2.16' into master
* stable-2.16
Document changes in allocation strategy
In multi-group allocation think about the whole cluster
Fix rst markup in design-2.16.rst
Update documentation versions for 2.16 release
* stable-2.15
Fix rollover condition in xenload
* stable-2.14
Revert 2.12-specific downgrade action on 2.14
* stable-2.13
Add ``--no-ssh-key-check`` to manpage of renew-crypto
Redistribute master key on downgrade
Use ssconf port map when handling SSH keys
Make node_daemon_setup use common functions
Add docstring to certificate verification
* stable-2.12
Also provide default arguments for mond
Support sphinx 1.3
Make documentation for -H serial_console more explicit
* stable-2.11
(no changes)
* stable-2.10
Fix typo in secondary
When hinting to do gnt-instance info, show the instance
Update gnt-network example in admin page
Conflicts:
doc/design-draft.rst: trivial
diff --cc doc/design-draft.rst
index 42d6204,3f2a1f3..b02937a
--- a/doc/design-draft.rst
+++ b/doc/design-draft.rst
@@@ -25,10 -24,7 +24,8 @@@ Design document draft
design-network2.rst
design-configlock.rst
design-multi-storage-htools.rst
- design-shared-storage-redundancy.rst
design-repaird.rst
- design-plain-redundancy.rst
+ design-migration-speed-hbal.rst
.. vim: set textwidth=72 :
.. Local Variables:
diff --cc doc/examples/ganeti.default
index 51512a3,49b7d8a..f0649a2
--- a/doc/examples/ganeti.default
+++ b/doc/examples/ganeti.default
@@@ -2,6 -2,6 +2,7 @@@
NODED_ARGS=""
RAPI_ARGS=""
CONFD_ARGS=""
+ MOND_ARGS=""
WCONFD_ARGS=""
LUXID_ARGS=""
+MAINTD_ARGS=""
diff --cc doc/examples/ganeti.default-debug
index a91efc7,00dece4..249f3fa
--- a/doc/examples/ganeti.default-debug
+++ b/doc/examples/ganeti.default-debug
@@@ -2,6 -2,6 +2,7 @@@
NODED_ARGS="-d"
RAPI_ARGS="-d"
CONFD_ARGS="-d"
+ MOND_ARGS="-d"
WCONFD_ARGS="-d"
LUXID_ARGS="-d"
+MAINTD_ARGS="-d"
--
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
