Merge branch 'stable-2.12' into stable-2.13
authorHrvoje Ribicic <riba@google.com>
Mon, 2 Nov 2015 17:49:36 +0000 (17:49 +0000)
committerHrvoje Ribicic <riba@google.com>
Mon, 2 Nov 2015 18:20:34 +0000 (18:20 +0000)
commit689e64c059d359b05f62d92fd1fcb708f796c809
tree20fa56895a8d9d1ba54bbe31f628a47fc28a6985
parentaef0cf52d2e11af374d0f14cc30b0333db2253c8
parentef3b5b42f6daf4f51e15ff0435ddc7049ff60af0
Merge branch 'stable-2.12' into stable-2.13

* stable-2.12
  Return the correct error code in the post-upgrade script
  Make openssl refrain from DH altogether
  Fix upgrades of instances with missing creation time

Conflicts:
cfgupgrade_unittest.py: merge version tests
tools/post-upgrade: return the correct error code for SSH
                    renewal as well

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Lisa Velden <velden@google.com>
src/Ganeti/Constants.hs
tools/cfgupgrade
tools/post-upgrade