projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2e8af7 612f7fd)
Merge branch 'devel-2.4' into stable-2.5
authorMichael Hanselmann <hansmi@google.com>
Wed, 11 Apr 2012 18:26:35 +0000 (20:26 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 11 Apr 2012 18:26:39 +0000 (20:26 +0200)
* devel-2.4:
  Fix extra whitespace
  Further fixes concerning drbd port release
  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

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