Merge branch 'stable-2.10' into stable-2.11
authorHrvoje Ribicic <riba@google.com>
Thu, 3 Sep 2015 12:10:34 +0000 (14:10 +0200)
committerHrvoje Ribicic <riba@google.com>
Thu, 3 Sep 2015 12:36:05 +0000 (14:36 +0200)
commit588b5da413b3712ddb4f3390b106d06384f2297a
treed4e8b86c946a22284474703f72eb7cd5066c02f7
parentf203596792e91dc497c82ae9c569ee6ae713b72c
parentebaf1c4e741237e92c442efd340e12748807c09e
Merge branch 'stable-2.10' into stable-2.11

* stable-2.10
  (no changes)

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

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
lib/cmdlib/instance_storage.py
man/ganeti.rst