Merge branch 'stable-2.10' into stable-2.11
authorHrvoje Ribicic <riba@google.com>
Thu, 19 Mar 2015 12:53:40 +0000 (13:53 +0100)
committerHrvoje Ribicic <riba@google.com>
Thu, 19 Mar 2015 13:19:43 +0000 (13:19 +0000)
* stable-2.10
  Make QA fail if KVM hotplugging fails
  Always preserve QA command output
  Don't lose stdout/stderr in AssertCommand
  qa_utils: Allow passing fail=None to AssertCommand
  qa_utils: Make AssertCommand return stdout/stderr as well
  Allow plain/DRBD conversions regardless of lack of disks
  Add support for ipolicy modifications to mock config

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

1  2 
lib/cmdlib/instance.py
qa/qa_instance.py
qa/qa_utils.py
test/py/cmdlib/instance_unittest.py
test/py/cmdlib/testsupport/config_mock.py

Simple merge
Simple merge
diff --cc qa/qa_utils.py
Simple merge
Simple merge