Merge branch 'stable-2.11' into stable-2.12
authorHrvoje Ribicic <riba@google.com>
Thu, 19 Mar 2015 15:08:41 +0000 (15:08 +0000)
committerHrvoje Ribicic <riba@google.com>
Thu, 19 Mar 2015 15:39:35 +0000 (15:39 +0000)
commit78b7c13bbb54a6401c8f9a4b64a360aa87f8895e
tree0e9f26196b60243884f6a9488deca95c57b95cea
parentac77262e30dc289da2c78af06c3701c39dcaeba4
parent1c5456b551468a3cc63377977b451fdcdf8e05bc
Merge branch 'stable-2.11' into stable-2.12

* stable-2.11
  Improve speed of Xen hypervisor unit tests
  Improve Xen instance state handling

* 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

Conflicts:
lib/cmdlib/instance.py
qa/qa_instance.py
test/py/cmdlib/testsupport/config_mock.py
Resolution:
instance.py: Keep new testing logic, modify snode fetch.
qa_instance.py: Reenable hotplug tests.
        config_mock.py: Combine all changes.

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>
lib/cmdlib/instance.py
lib/hypervisor/hv_xen.py
qa/qa_instance.py
qa/qa_utils.py
test/py/cmdlib/instance_unittest.py
test/py/cmdlib/testsupport/config_mock.py