projects / ganeti-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa3c0df f203596)
Merge branch 'stable-2.11' into stable-2.12
authorLisa Velden <velden@google.com>
Mon, 3 Aug 2015 07:00:43 +0000 (09:00 +0200)
committerLisa Velden <velden@google.com>
Mon, 3 Aug 2015 07:50:50 +0000 (07:50 +0000)
* stable-2.11
  (no changes)

* 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)