Merge branch 'stable-2.10' into stable-2.11
authorHrvoje Ribicic <riba@google.com>
Mon, 30 Nov 2015 16:12:42 +0000 (17:12 +0100)
committerHrvoje Ribicic <riba@google.com>
Mon, 30 Nov 2015 16:27:40 +0000 (17:27 +0100)
commit484bea777f45b685413dde9b84f8f5d0daf0c5bf
tree37ebcb72e51631ce50fddcd1b26543c8fb2edf76
parent9614023f358306b777f99c360a04bf78ff2a5116
parent54500c1cfd93bc439ca26170a246557062e80a65
Merge branch 'stable-2.10' into stable-2.11

* 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:
  qa/qa_rapi.py - simply append new changes

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