Merge branch 'stable-2.9' into stable-2.10

* stable-2.9
  Revision bump for 2.9.0
  Schedule release of 2.9.0

* stable-2.8
  Improve error message for replace-disks

Conflicts:
	NEWS: trivial
	configure.ac: drop suffix bump of stable-2.9

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>

diff --cc NEWS
index 42a295e,e11aee1..efff5ac
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,78 -2,10 +2,78 @@@ New
  ====
  
  
 +Version 2.10.0 alpha1
 +---------------------
 +
 +*(unreleased)*
 +
 +Incompatible/important changes
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- Adding disks with 'gnt-instance modify' now waits for the disks to sync per
 +  default. Specify --no-wait-for-sync to override this behavior.
 +- The Ganeti python code now adheres to a private-module layout. In particular,
 +  the module 'ganeti' is no longer in the python search path.
 +- On instance allocation, the iallocator now considers non-LVM storage
 +  properly. In particular, actual file storage space information is used
 +  when allocating space for a file/sharedfile instance.
 +- When disabling disk templates cluster-wide, the cluster now first
 +  checks whether there are instances still using those templates.
 +- 'gnt-node list-storage' now also reports storage information about
 +  file-based storage types.
 +
 +New features
 +~~~~~~~~~~~~
 +
 +- KVM hypervisors can now access RBD storage directly without having to
 +  go through a block device.
 +- A new command 'gnt-cluster upgrade' was added that automates the upgrade
 +  procedure between two Ganeti versions that are both 2.10 or higher.
 +- The move-instance command can now change disk templates when moving
 +  instances, and does not require any node placement options to be
 +  specified if the destination cluster has a default iallocator.
 +- Users can now change the soundhw and cpuid settings for XEN hypervisors.
 +- Hail and hbal now have the (optional) capability of accessing average CPU
 +  load information through the monitoring deamon, and to use it to dynamically
 +  adapt the allocation of instances.
 +- Hotplug support. Introduce new option '--hotplug' to ``gnt-instance modify``
 +  so that disk and NIC modifications take effect without the need of actual
 +  reboot. There are a couple of constrains currently for this feature:
 +
 +   - only KVM hypervisor (versions >= 1.0) supports it,
 +   - one can not (yet) hotplug a disk using userspace access mode for RBD
 +   - in case of a downgrade instances should suffer a reboot in order to
 +     be migratable (due to core change of runtime files)
 +
 +Misc changes
 +~~~~~~~~~~~~
 +
 +- A new test framework for logical units was introduced and the test
 +  coverage for logical units was improved significantly.
 +- Opcodes are entirely generated from Haskell using the tool 'hs2py' and
 +  the module 'src/Ganeti/OpCodes.hs'.
 +- Constants are also generated from Haskell using the tool
 +  'hs2py-constants' and the module 'src/Ganeti/HsConstants.hs', with the
 +  exception of socket related constants, which require changing the
 +  cluster configuration file, and HVS related constants, because they
 +  are part of a port of instance queries to Haskell.  As a result, these
 +  changes will be part of the next release of Ganeti.
 +
 +New dependencies
 +~~~~~~~~~~~~~~~~
 +
 +The following new dependencies have been added/updated.
 +
 +Python
 +
 +- The version requirements for ``python-mock`` have increased to at least
 +  version 1.0.1. It is still used for testing only.
 +
 +
- Version 2.9.0 rc4
- -----------------
+ Version 2.9.0
+ -------------
  
- *(unreleased)*
+ *(Released Tue, 5 Nov 2013)*
  
  Incompatible/important changes
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --cc lib/cmdlib/instance_storage.py
Simple merge