projects / ganeti-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e117a3b 45fc593)
Merge branch 'stable-2.10' into stable-2.11
authorLisa Velden <velden@google.com>
Fri, 31 Jul 2015 08:22:01 +0000 (10:22 +0200)
committerLisa Velden <velden@google.com>
Fri, 31 Jul 2015 09:16:34 +0000 (11:16 +0200)
* stable-2.10
  Add a new unit test for LUInstanceMultiAlloc
  Fix a bug in LUInstanceMultiAlloc LU

Signed-off-by: Lisa Velden <velden@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

1  2 
lib/cmdlib/instance.py patch | diff1 | diff2 | blob | history
test/py/cmdlib/instance_unittest.py patch | diff1 | diff2 | blob | history

diff --cc lib/cmdlib/instance.py
Simple merge
diff --cc test/py/cmdlib/instance_unittest.py
Simple merge
Ganeti core (mirrored from github)