projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e2ed2e c434401)
Merge branch 'stable-2.5' into devel-2.5
authorMichael Hanselmann <hansmi@google.com>
Thu, 12 Apr 2012 16:12:48 +0000 (18:12 +0200)
committerMichael Hanselmann <hansmi@google.com>
Thu, 12 Apr 2012 17:52:39 +0000 (19:52 +0200)
* stable-2.5:
  Bump version for 2.5.0 final release
  configure.ac: Fix “too many arguments” error
  Fix extra whitespace
  Further fixes concerning drbd port release
  Fix a bug concerning TCP port release
  Fix extra whitespace
  Fix a bug concerning TCP port release

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

1  2 
lib/cmdlib.py patch | diff1 | diff2 | blob | history
lib/config.py patch | diff1 | diff2 | blob | history

diff --cc lib/cmdlib.py
Simple merge
diff --cc lib/config.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.