projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 268dca3 f89b3fc)
Merge branch 'stable-2.6-hotplug' into stable-2.6-ippool-hotplug-esi
authorDimitris Aragiorgis <dimara@grnet.gr>
Tue, 6 Nov 2012 18:18:05 +0000 (20:18 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Tue, 6 Nov 2012 18:18:05 +0000 (20:18 +0200)
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.