Merge branch 'stable-2.1'

* stable-2.1:
  Bump up version for the 2.1.4 release
  Update NEWS about the latest 2.1 change
  Fix handling of errors from socket.gethostbyname
  Update a comment in qa-sample.json
  RAPI client: Add support for Python 2.6
  Update NEWS for Ganeti 2.1.4

Conflicts:
	NEWS: keep both
	configure.ac: keep the 2.2 version
	qa/qa-sample.json: merge nearby changes

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --cc NEWS
index 8331994,3709052..b6cd1fd
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,35 -1,28 +1,58 @@@
  News
  ====
  
 +Version 2.2.0 beta 0
 +--------------------
 +
 +*(Released Thu, 17 Jun 2010)*
 +
 +- Added tool (``move-instance``) and infrastructure to move instances
 +  between separate clusters (see :doc:`separate documentation
 +  <move-instance>` and :doc:`design document <design-2.2>`)
 +- Added per-request RPC timeout
 +- RAPI now requires a Content-Type header for requests with a body (e.g.
 +  ``PUT`` or ``POST``) which must be set to ``application/json`` (see
 +  RFC2616 (HTTP/1.1), section 7.2.1)
 +- ``ganeti-watcher`` attempts to restart ``ganeti-rapi`` if RAPI is not
 +  reachable
 +- Implemented initial support for running Ganeti daemons as separate
 +  users, see configure-time flags ``--with-user-prefix`` and
 +  ``--with-group-prefix`` (only ``ganeti-rapi`` is supported at this
 +  time)
 +- Instances can be removed after export (``gnt-backup export
 +  --remove-instance``)
 +- Self-signed certificates generated by Ganeti now use a 2048 bit RSA
 +  key (instead of 1024 bit)
 +- Added new cluster configuration file for cluster domain secret
 +- Import/export now use SSL instead of SSH
 +- Added support for showing estimated time when exporting an instance,
 +  see the ``ganeti-os-interface(7)`` manpage and look for
 +  ``EXP_SIZE_FD``
 +
 +
+ Version 2.1.4
+ -------------
+ 
+ *(Released Fri, 18 Jun 2010)*
+ 
+ A small bugfix release:
+ 
+   - Fix live migration of KVM instances started with older Ganeti
+     versions which had fewer hypervisor parameters
+   - Fix gnt-instance grow-disk on down instances
+   - Fix an error-reporting bug during instance migration
+   - Better checking of the ``--net`` and ``--disk`` values, to avoid
+     silently ignoring broken ones
+   - Fix an RPC error reporting bug affecting, for example, RAPI client
+     users
+   - Fix bug triggered by different API version os-es on different nodes
+   - Fix a bug in instance startup with custom hvparams: OS level
+     parameters would fail to be applied.
+   - Fix the RAPI client under Python 2.6 (but more work is needed to
+     make it work completely well with OpenSSL)
+   - Fix handling of errors when resolving names from DNS
+ 
++
  Version 2.1.3
  -------------
  

diff --cc lib/utils.py
Simple merge

diff --cc qa/qa-sample.json
index 193f51e,7de6545..05f36ec
--- 1/qa/qa-sample.json
--- 2/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@@ -87,12 -87,9 +87,12 @@@
      "# Disabled by default because it takes rather long": null,
      "instance-replace-disks": false,
  
 +    "# Whether to test the tools/move-instance utility": null,
 +    "inter-cluster-instance-move": false,
 +
-     "# Make sure not to include the disk(s) required for Dom0 to be": null,
-     "# included in the volume group used for instances. Otherwise": null,
-     "# whole system may stop working until restarted.": null,
+     "# Make sure not to include the disk(s) required for Dom0 to be up": null,
+     "# in the volume group used for instances. Otherwise the whole": null,
+     "# system may stop working until restarted.": null,
      "instance-disk-failure": false
    },