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)
* 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>

1  2 
lib/cmdlib/instance_storage.py
man/ganeti.rst

Simple merge
diff --cc man/ganeti.rst
Simple merge