Merge branch 'stable-2.12' into stable-2.13
authorHrvoje Ribicic <riba@google.com>
Thu, 3 Dec 2015 21:13:39 +0000 (21:13 +0000)
committerHrvoje Ribicic <riba@google.com>
Thu, 3 Dec 2015 21:13:39 +0000 (21:13 +0000)
commite1b989b7aa3286a5d4426b48e37755414de2d27f
treefc7e4d770097bc486ed3ee66102ed62e59de517b
parent85e1c5805bbb55d4d68524e5b7965e807dfce52d
parent6f9ba80f8312d5607da70841f698c49000a31126
Merge branch 'stable-2.12' into stable-2.13

* stable-2.12
  Restrict showing of DRBD secret using types
  Calculate correct affected nodes set in InstanceChangeGroup

* 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

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Oleg Ponomarev <oponomarev@google.com>
lib/client/gnt_instance.py
lib/cmdlib/instance.py
lib/cmdlib/instance_query.py
lib/objects.py
lib/storage/drbd.py
qa/ganeti-qa.py
qa/qa_rapi.py
src/Ganeti/Config.hs
src/Ganeti/Objects.hs
test/hs/Test/Ganeti/Objects.hs