Merge branch 'stable-2.8' into master
authorBernardo Dal Seno <bdalseno@google.com>
Fri, 31 May 2013 13:36:42 +0000 (15:36 +0200)
committerBernardo Dal Seno <bdalseno@google.com>
Fri, 31 May 2013 13:36:42 +0000 (15:36 +0200)
commit342a9b3b7346e760e7798262233303406bdb5d70
treec3405765f314f5bf2a8fcd65bdd5f721ef431105
parent33ee45c22cf4dc20cb618c97aecd751fa858ba7f
parente41d5a224f86ca466e8aa7f9126ccca0c02b717e
Merge branch 'stable-2.8' into master

* stable-2.8:
  Document users-setup tool
  Adjusting permissions after confd start
  Ensure the queue socket has the right permissions
  Update IAllocator interface documentation
  Add NEWS entry for hail honoring networks
  Add tests for network-aware allocation
  Honor network connections in hail
  Parse NIC data from allocation request in hail
  Support group networks in Text backend
  Parse node group networks
  Update IAllocator interface documentation
  Export connected networks to IAllocator
  Re-activate previously active disks in watcher
  Make the disks_active flag queryable
  Consider disks_active in UpgradeConfig
  Add disks_active to configuration
  Fix release of instances in QA

Conflicts:
tools/cfgupgrade

tools/cfgupgrade was modified in stable-2.8 to remove a new parameter when
downgrading to 2.7, but this shouldn't go into the 2.9 version of
cfgupgrade.

Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
16 files changed:
Makefile.am
NEWS
lib/cmdlib/cluster.py
lib/cmdlib/instance.py
lib/cmdlib/instance_storage.py
lib/cmdlib/node.py
lib/masterd/iallocator.py
lib/objects.py
man/htools.rst
qa/qa_instance.py
src/Ganeti/HTools/Backend/Luxi.hs
src/Ganeti/HTools/Backend/Rapi.hs
src/Ganeti/HTools/Backend/Text.hs
src/Ganeti/Objects.hs
test/data/htools/unique-reboot-order.data
test/hs/Test/Ganeti/Objects.hs