projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac2c8bc f396ad8)
Merge branch 'devel-2.4' into devel-2.5
authorMichael Hanselmann <hansmi@google.com>
Fri, 18 Nov 2011 07:27:30 +0000 (08:27 +0100)
committerMichael Hanselmann <hansmi@google.com>
Fri, 18 Nov 2011 10:05:49 +0000 (11:05 +0100)
commit05c2e624355ea578ed1462daa14390c77c7199df
tree45f796fa1663f65e0f84c89801ce1219a387657etree | snapshot
parentac2c8bc064d4903f8b104822f3c1fbc7d5940295commit | diff
parentf396ad8c7907646093f554d207cc6d90b17a8a8bcommit | diff
Merge branch 'devel-2.4' into devel-2.5

* devel-2.4:
  Ensure unused ports return to the free port pool
  Re-wrap a paragraph to eliminate a sphinx warning

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
lib/cmdlib.py diff1 | diff2 | blob | history
lib/config.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.