Merge branch 'stable-2.13' into stable-2.14
authorHrvoje Ribicic <riba@google.com>
Thu, 3 Dec 2015 22:55:20 +0000 (22:55 +0000)
committerHrvoje Ribicic <riba@google.com>
Fri, 4 Dec 2015 14:55:45 +0000 (14:55 +0000)
commit345c84b4a92aa077e9c9ff2fbe98e86623bb0486
treeb47ae95be8d45d8caff869fd76e8a1cbf1a00c2a
parente0c7a2408035ee6594369dff7f2094db296d71af
parente1b989b7aa3286a5d4426b48e37755414de2d27f
Merge branch 'stable-2.13' into stable-2.14

* stable-2.13
  (no changes)

* 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

Conflicts:
  src/Ganeti/Objects.hs - Followed code to Disk.hs
  test/hs/Test/Ganeti/Objects.hs - Added Private to disk definition

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Helga Velroyen <helgav@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
src/Ganeti/Config.hs
src/Ganeti/Objects.hs
src/Ganeti/Objects/Disk.hs
test/hs/Test/Ganeti/Objects.hs