commit 8f4504d177435d70edb392ec7d23c3052a26151a
Merge: 095465c 12f7d6e
Author: Klaus Aehlig <[email protected]>
Date: Thu Jul 16 16:35:50 2015 +0200
Merge branch 'stable-2.16' into master
* stable-2.16
(no changes)
* stable-2.15
(no changes)
* stable-2.14
Do not version generate file tools/ssl-update
Revision bump for 2.14.1
Update NEWS for 2.14.1
* stable-2.13
NEWS: move 2.13.0 beta/rc to their place
Document data collector options
Correct NEWS file entry
Revision bump for 2.13.2
Update the NEWS file for 2.13.2
* stable-2.12
Bugfix in checkInstanceMove function in Cluster.hs
Revision bump for 2.12.5
Update the NEWS file for 2.12.5
Update Xen documentation in install.rst
Clarify need for the migration_port Xen param
Conflicts:
man/gnt-cluster.rst: take all additions
diff --cc man/gnt-cluster.rst
index 9b495f3,e075411..6ce43b1
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@@ -710,7 -710,8 +710,9 @@@ MODIF
| [\--install-image *image*]
| [\--zeroing-image *image*]
| [\--user-shutdown {yes \| no}]
+ | [\--enabled-data-collectors *collectors*]
+ | [\--data-collector-interval *intervals*]
+| [\--maintenance-interval *seconds*]
Modify the options for the cluster.
@@@ -775,9 -776,13 +777,16 @@@ parameters for instance communication
Ganeti will check its parameters and warn about unusual configurations,
but it will still use that network for instance communication.
+ The ``--enabled-data-collectors`` and ``--data-collector-interval``
+ options are to control the behavior of the **ganeti-mond**\(8). The
+ first expects a list name=bool pairs to activate or decative the mentioned
+ data collector. The second option expects similar pairs of collector name
+ and number of seconds specifying the interval at which the collector
+ shall be collected.
+
+The ``--maintenance-interval`` option specified the minimal waiting
+time by the maintenance daemon between maintenance rounds.
+
See **gnt-cluster init** for a description of ``--install-image`` and
--
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
