Commit 626f4e45 authored by Guido Trotter's avatar Guido Trotter
Browse files

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: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 85b243e8 baa17cda
......@@ -30,6 +30,29 @@ Version 2.2.0 beta 0
``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
-------------
......
......@@ -1129,8 +1129,9 @@ class HostInfo:
"""
try:
result = socket.gethostbyname_ex(hostname)
except socket.gaierror, err:
# hostname not found in DNS
except (socket.gaierror, socket.herror, socket.error), err:
# hostname not found in DNS, or other socket exception in the
# (code, description format)
raise errors.ResolverError(hostname, err.args[0], err.args[1])
return result
......
......@@ -90,9 +90,9 @@
"# 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
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment