Merge branch 'stable-2.11' into stable-2.12
authorKlaus Aehlig <aehlig@google.com>
Tue, 3 Jun 2014 14:05:02 +0000 (16:05 +0200)
committerKlaus Aehlig <aehlig@google.com>
Tue, 3 Jun 2014 15:04:48 +0000 (17:04 +0200)
commit8da1de6a216b677a6bfa6054bc1f79a735a46a4d
tree5fbee136bfd639d3d264d69bf8668745f6724b51
parented9ca17e89f3220cf6459723defece428307994d
parent0c9204bd62d79cf361911bfcd31060bfd31a824b
Merge branch 'stable-2.11' into stable-2.12

* stable-2.11
  Assume that instance keys might not be present in watcher
  Modify 'Hypervisor.ListInstances' to exclude user downs
  Extend QA for instance user down
  Allow instance start for user down instances
  Modify watcher to properly cleanup user down instances
  Modify instance shutdown to optionally mark as user down
  Fix instance queries to correctly report USER_down
  Modify config to update 'admin_state_source'
  Add field 'admin_state_source' to unit tests
  Add field 'admin_state_source' to the Instance class
  Add type 'AdminStateSource', tracks changes to 'admin_state'
  luxid: report error-down when user shutdown not allowed
  Correctly report user-down instance status
  Use standard 'Raise' method for LU exceptions
  Remove unnecessary list copying
  Use keyword args when passing 'hvparams' to 'ListInstances'
  Fix whitespace
  Fix typo in docstring

* stable-2.10
  Revision bump for 2.10.5
  Add NEWS file for 2.10.5
  Check drbd helper only in VM capable nodes
  Raise' called inside 'CheckPrereq' needs the prereq kw

Conflicts:
lib/backend.py: union of changes
lib/cmdlib/instance.py: apply admin_source to stable-2.12 version
lib/cmdlib/instance_operation.py: union of additions
lib/config.py: tedious, but elementary, uion; additionally, follow
    the semantical change of locking to _ConfigSync()
lib/ht.py: trivial
qa/ganeti-qa.py: take stable-2.12
src/Ganeti/Luxi.hs: take stable-2.12
src/Ganeti/Objects.hs: trivial
test/data/instance-prim-sec.txt: delete
test/hs/Test/Ganeti/Query/Instance.hs: trivial
tools/cfgupgrade: take all the upgrade parts, but only
    use the downgrade parts from stable-2.12

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>
30 files changed:
NEWS
lib/backend.py
lib/cmdlib/cluster.py
lib/cmdlib/common.py
lib/cmdlib/instance.py
lib/cmdlib/instance_migration.py
lib/cmdlib/instance_operation.py
lib/cmdlib/instance_query.py
lib/cmdlib/node.py
lib/config.py
lib/ht.py
lib/hypervisor/hv_kvm/__init__.py
lib/hypervisor/hv_xen.py
lib/objects.py
lib/query.py
lib/watcher/__init__.py
qa/qa_instance.py
src/Ganeti/Constants.hs
src/Ganeti/Objects.hs
src/Ganeti/OpCodes.hs
src/Ganeti/OpParams.hs
src/Ganeti/Query/Instance.hs
src/Ganeti/Types.hs
test/hs/Test/Ganeti/Objects.hs
test/hs/Test/Ganeti/OpCodes.hs
test/hs/Test/Ganeti/Query/Instance.hs
test/py/cmdlib/node_unittest.py
test/py/cmdlib/testsupport/config_mock.py
test/py/ganeti.query_unittest.py
tools/cfgupgrade