Merge branch 'devel-2.2' into devel-2.3

* devel-2.2:
  Update NEWS & configure.ac for the 2.2.2 release
  Fix documentation regarding conversion to drbd

Conflicts:
	NEWS         (integrated 2.2 changes)
	configure.ac (kept our version)

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --cc NEWS
index ccc5391,ba1e881..606dcb9
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,49 -1,20 +1,63 @@@
  News
  ====
  
 +Version 2.3.0 rc0
 +-----------------
 +
 +*(Released Tue, 2 Nov 2010)*
 +
 +- Fixed clearing of the default iallocator using ``gnt-cluster modify``
 +- Fixed master failover race with watcher
 +- Fixed a bug in ``gnt-node modify`` which could lead to an inconsistent
 +  configuration
 +- Accept previously stopped instance for export with instance removal
 +- Simplify and extend the environment variables for instance OS scripts
 +- Added new node flags, ``master_capable`` and ``vm_capable``
 +- Added optional instance disk wiping prior during allocation. This is a
 +  cluster-wide option and can be set/modified using
 +  ``gnt-cluster {init,modify} --prealloc-wipe-disks``.
 +- Added IPv6 support, see :doc:`design document <design-2.3>` and
 +  :doc:`install-quick`
 +- Added a new watcher option (``--ignore-pause``)
 +- Added option to ignore offline node on instance start/stop
 +  (``--ignore-offline``)
 +- Allow overriding OS parameters with ``gnt-instance reinstall``
 +- Added ability to change node's secondary IP address using ``gnt-node
 +  modify``
 +- Implemented privilege separation for all daemons except
 +  ``ganeti-noded``, see ``configure`` options
 +- Complain if an instance's disk is marked faulty in ``gnt-cluster
 +  verify``
 +- Implemented job priorities (see ``ganeti(7)`` manpage)
 +- Ignore failures while shutting down instances during failover from
 +  offline node
 +- Exit daemon's bootstrap process only once daemon is ready
 +- Export more information via ``LUQueryInstances``/remote API
 +- Improved documentation, QA and unittests
 +- RAPI daemon now watches ``rapi_users`` all the time and doesn't need a
 +  restart if the file was created or changed
 +- Added LUXI protocol version sent with each request and response,
 +  allowing detection of server/client mismatches
 +- Moved the Python scripts among gnt-* and ganeti-* into modules
 +- Moved all code related to setting up SSH to an external script,
 +  ``setup-ssh``
 +- Infrastructure changes for node group support in future versions
 +
 +
+ Version 2.2.2
+ -------------
+ 
+ *(Released Fri, 19 Nov 2010)*
+ 
+ A few small bugs fixed, and some improvements to the build system:
+ 
+ - Fix documentation regarding conversion to drbd
+ - Fix validation of parameters in cluster modify (``gnt-cluster modify
+   -B``)
+ - Fix error handling in node modify with multiple changes
+ - Allow remote imports without checked names
+ 
+ 
  Version 2.2.1
  -------------