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)
commit1fed8ef12cf5b283406d1122e883a4fcb699fa9b
treee8b9f2f3605df5e63d41d79b7894da09cb5bd24a
parentfa3c0df5726a203e54eb66b117b16c5da3ca1231
parentf203596792e91dc497c82ae9c569ee6ae713b72c
Merge branch 'stable-2.11' into stable-2.12

* 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>
lib/cmdlib/instance.py
test/py/cmdlib/instance_unittest.py