projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 800ac39 9a91d35)
Merge branch 'devel-2.3'
authorMichael Hanselmann <hansmi@google.com>
Thu, 2 Dec 2010 15:52:57 +0000 (16:52 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 2 Dec 2010 15:58:34 +0000 (16:58 +0100)
commit3c8a73a40cd253facdaa98efe7d72ef3d63c2a43
treeb7d38c53c85f1e9f68e5d33e2677ca047857f2e1tree | snapshot
parent800ac39940a3c3598d9d53814e329a64b831d51ecommit | diff
parent9a91d357781964f146d680830aa1c76ceeb97892commit | diff
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: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
NEWS diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
lib/locking.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.