Merge branch 'stable-2.13' into stable-2.14
authorHrvoje Ribicic <riba@google.com>
Fri, 4 Sep 2015 12:54:54 +0000 (12:54 +0000)
committerHrvoje Ribicic <riba@google.com>
Fri, 4 Sep 2015 13:51:58 +0000 (15:51 +0200)
commit526a79187ad114df85199265a1f09e61c3e2535b
tree9024fe89aab9ea8e6962c927efb67406288d4dff
parentd34baa7035137ab71777bb94367d849335b26dca
parent7149806b24f0446fc09d44a1f1633f58cbf3bc1d
Merge branch 'stable-2.13' into stable-2.14

* stable-2.13
  Fix typo in example
  Update documentation of --print-jobid

* stable-2.12
  Add forgotten IPOLICY_SPINDLE_RATIO to __all__ variable
  Make QA turn on user-shutdown when testing it
  Fix disabling of user shutdown reporting
  Make confd answer disk requests querying by name
  gnt-node add: password auth is only one method

* stable-2.11
  (no changes)

* stable-2.10
  (no changes)

* stable-2.9
  Document quoting of special values in key-value parameters
  replace-disks: fix --ignore-ipolicy

Conflicts:
  src/Ganeti/Query/Instance.hs # Added Just and Maybes

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Lisa Velden <velden@google.com>
lib/cli.py
lib/cli_opts.py
lib/cmdlib/instance_storage.py
man/gnt-backup.rst
man/gnt-instance.rst
man/gnt-node.rst
qa/qa_instance.py
src/Ganeti/Query/Instance.hs