Merge branch 'stable-2.8' into stable-2.9

* stable-2.8
  Add a default to file-driver when unspecified over RAPI
  Remove typo from RAPI documentation
  Describe the files in doc/users in NEWS
  Update the upgrade procedure

* stable-2.7
  Fix incorrect manpage reference to htools

Conflicts:
	NEWS
	configure.ac
	lib/cmdlib/instance.py
	man/hroller.rst

All trivial, except for man/hrooler.rst, where the
fix in the section number was manually applied to the
new text.

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>

diff --cc NEWS
index 9cebb7d,9d4e1ed..ce97e11
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,76 -2,12 +2,76 @@@ New
  ====
  
  
 +Version 2.9.0 beta1
 +-------------------
 +
 +*(Released Thu, 29 Aug 2013)*
 +
 +Incompatible/important changes
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- hroller now also plans for capacity to move non-redundant instances off
 +  any node to be rebooted; the old behavior of completely ignoring any
 +  non-redundant instances can be restored by adding the --ignore-non-redundant
 +  option.
 +- The cluster option '--no-lvm-storage' was removed in favor of the new option
 +  '--enabled-disk-templates'.
 +- On instance creation, disk templates no longer need to be specified
 +  with '-t'. The default disk template will be taken from the list of
 +  enabled disk templates.
 +- The monitoring daemon is now running as root, in order to be able to collect
 +  information only available to root (such as the state of Xen instances).
 +- The ConfD client is now IPv6 compatible.
 +- File and shared file storage is no longer dis/enabled at configure time,
 +  but using the option '--enabled-disk-templates' at cluster initialization and
 +  modification.
 +- The default directories for file and shared file storage are not anymore
 +  specified at configure time, but taken from the cluster's configuration.
 +  They can be set at cluster initialization and modification with
 +  '--file-storage-dir' and '--shared-file-storage-dir'.
 +- Cluster verification now includes stricter checks regarding the
 +  default file and shared file storage directories. It now checks that
 +  the directories are explicitely allowed in the 'file-storage-paths' file and
 +  that the directories exist on all nodes.
 +- The list of allowed disk templates in the instance policy and the list
 +  of cluster-wide enabled disk templates is now checked for consistency
 +  on cluster or group modification. On cluster initialization, the ipolicy
 +  disk templates are ensured to be a subset of the cluster-wide enabled
 +  disk templates.
 +
 +New features
 +~~~~~~~~~~~~
 +
 +- DRBD 8.4 support. Depending on the installed DRBD version, Ganeti now uses
 +  the correct command syntax. It is possible to use different DRBD versions
 +  on different nodes as long as they are compatible to each other. This
 +  enables rolling upgrades of DRBD with no downtime. As permanent operation
 +  of different DRBD versions within a node group is discouraged,
 +  ``gnt-cluster verify`` will emit a warning if it detects such a situation.
 +- New "inst-status-xen" data collector for the monitoring daemon, providing
 +  information about the state of the xen instances on the nodes.
 +- New "lv" data collector for the monitoring daemon, collecting data about the
 +  logical volumes on the nodes, and pairing them with the name of the instances
 +  they belong to.
 +- New "diskstats" data collector, collecting the data from /proc/diskstats and
 +  presenting them over the monitoring daemon interface.
 +- The ConfD client is now IPv6 compatible.
 +
 +New dependencies
 +~~~~~~~~~~~~~~~~
 +The following new dependencies have been added.
 +
 +Python
 +
 +- ``python-mock`` (http://www.voidspace.org.uk/python/mock/) is now a required
 +  for the unit tests (and only used for testing).
 +
 +
- Version 2.8.0 rc2
+ Version 2.8.0 rc3
  -----------------
  
- *(Released Tue, 27 Aug 2013)*
+ *(Released Tue, 17 Sep 2013)*
  
 -
  Incompatible/important changes
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  

diff --cc doc/rapi.rst
Simple merge

diff --cc lib/cli.py
Simple merge

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

diff --cc man/hroller.rst
index 911bae4,80d2984..6165098
--- 1/man/hroller.rst
--- 2/man/hroller.rst
+++ b/man/hroller.rst
@@@ -65,42 -54,9 +65,41 @@@ secondary nodes, and it is safe to rebo
  OPTIONS
  -------
  
- For a description of the standard options check **htools**\(7) and
 -Currently only standard htools options are supported. For a description of them
 -check **htools**\(1) and **hbal**\(1).
++For a description of the standard options check **htools**\(1) and
 +**hbal**\(1).
 +
 +\--force
 +  Do not fail, even if the master node cannot be determined.
 +
 +\--node-tags *tag,...*
 +  Restrict to nodes having at least one of the given tags.
 +
 +\--full-evacuation
 +  Also plan moving secondaries out of the nodes to be rebooted. For
 +  each instance the move is at most a migrate (if it was primary
 +  on that node) followed by a replace secondary.
 +
 +\--skip-non-redundant
 +  Restrict to nodes not hosting any non-redundant instance.
 +
 +\--offline-maintenance
 +  Pretend that all instances are shutdown before the reboots are carried
 +  out. I.e., only edges from the primary to the secondary node of an instance
 +  are considered.
 +
 +\--ignore-non-redundnant
 +  Pretend that the non-redundant instances do not exist, and only take
 +  instances with primary and secondary node into account.
 +
 +\--one-step-only
 +  Restrict to the first reboot group. Output the group one node per line.
 +
 +\--print-moves
 +  After each group list for each affected instance a node
 +  where it can be evacuated to. The moves are computed under the assumption
 +  that after each reboot group, all instances are moved back to their
 +  initial position.
  
- 
  BUGS
  ----