Commit 3c8a73a4 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge branch 'devel-2.3'



* devel-2.3:
  locking: Clarify message for removed locks
  Bump version for 2.3.1~rc1 release
  impexpd: Disable OpenSSL compression in socat if possible
  Bump version for 2.3.0

Conflicts:
	NEWS: Trivial
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 800ac399 9a91d357
......@@ -10,6 +10,26 @@ Version 2.4.0 rc1
``…/ganeti/rapi/users``
Version 2.3.1 rc1
-----------------
*(Released Wed, 1 Dec 2010)*
- impexpd: Disable OpenSSL compression in socat if possible (backport
from master, commit e90739d625b, see :doc:`installation guide
<install-quick>` for details)
- Changed unittest coverage report to exclude test scripts
- Added script to check version format
Version 2.3.0
-------------
*(Released Wed, 1 Dec 2010)*
Released version 2.3.0~rc1 without any changes.
Version 2.3.0 rc1
-----------------
......
# Configure script for Ganeti
m4_define([gnt_version_major], [2])
m4_define([gnt_version_minor], [3])
m4_define([gnt_version_revision], [0])
m4_define([gnt_version_revision], [1])
m4_define([gnt_version_suffix], [~rc1])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
......
......@@ -1047,8 +1047,8 @@ class LockSet:
# element is not there anymore.
continue
raise errors.LockError("Non-existing lock %s in set %s" %
(lname, self.name))
raise errors.LockError("Non-existing lock %s in set %s (it may have"
" been removed)" % (lname, self.name))
acquire_list.append((lname, lock))
......@@ -1080,8 +1080,8 @@ class LockSet:
# particular element is not there anymore.
continue
raise errors.LockError("Non-existing lock %s in set %s" %
(lname, self.name))
raise errors.LockError("Non-existing lock %s in set %s (it may"
" have been removed)" % (lname, self.name))
if not acq_success:
# Couldn't get lock or timeout occurred
......
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