Merge branch 'stable-2.12' into stable-2.13
authorLisa Velden <velden@google.com>
Mon, 3 Aug 2015 11:45:42 +0000 (13:45 +0200)
committerLisa Velden <velden@google.com>
Mon, 3 Aug 2015 14:26:02 +0000 (14:26 +0000)
commit041247c6f658428ea64cfba8fe3cc4d78b05808c
tree6cc5e582967ea938b3b70a32d7792293d10ca0ac
parentbab1c6311ff41adf2925ae2f7027107d84e66bf2
parentc7a2958ef392449a244ba55db41eafa7d343d3ce
Merge branch 'stable-2.12' into stable-2.13

* stable-2.12
  Correct indendation
  In confd provide proper serial number

* stable-2.11
  (no changes)

* stable-2.10
  Add a new unit test for LUInstanceMultiAlloc
  Fix a bug in LUInstanceMultiAlloc LU

Conflicts:
      lib/bootstrap.py

Resolution:
        lib/bootstrap.py: take indendation from stable-2.12

Semantical conflicts:
        src/Ganeti/Confd/Server.hs: add serial number to new queries

Signed-off-by: Lisa Velden <velden@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>
lib/bootstrap.py
lib/cmdlib/instance.py
src/Ganeti/Confd/Server.hs
test/py/cmdlib/instance_unittest.py