projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e43e78d 47342ca)
Merge branch 'stable-2.6-esi' into stable-2.6-ippool-hotplug-esi v2.6.0+ippool8+hotplug2+extstorage3
authorConstantinos Venetsanopoulos <cven@grnet.gr>
Fri, 21 Sep 2012 09:32:07 +0000 (12:32 +0300)
committerConstantinos Venetsanopoulos <cven@grnet.gr>
Fri, 21 Sep 2012 09:32:07 +0000 (12:32 +0300)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.