Merge branch 'stable-2.11' into stable-2.12
authorHrvoje Ribicic <riba@google.com>
Tue, 1 Dec 2015 15:57:49 +0000 (15:57 +0000)
committerHrvoje Ribicic <riba@google.com>
Tue, 1 Dec 2015 16:38:50 +0000 (16:38 +0000)
commite1cf5672686e333eb80efd78eeb095a6bfafe09f
treefa7ed7c4c7533ae0526389aeaf5041033ef7a2fd
parentfb0489a6acce067d0197ad4d26badd916378fd4c
parent484bea777f45b685413dde9b84f8f5d0daf0c5bf
Merge branch 'stable-2.11' into stable-2.12

* stable-2.11
  (no changes)

* stable-2.10
  (no changes)

* stable-2.9
  QA: Ensure the DRBD secret is not retrievable via RAPI
  Redact the DRBD secret in instance queries
  Do not attempt to use the DRBD secret in gnt-instance info

Conflicts:
  lib/client/gnt_instance.py - taken the 2.11 version, with explicit
                               parameter use
  qa/qa_rapi.py - merged imports, resolved trivial conflict

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
lib/client/gnt_instance.py
lib/cmdlib/instance_query.py
qa/ganeti-qa.py
qa/qa_rapi.py