]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Code Review / openstack-build / neutron-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 78bdaa5 d5086c8)
Merge trunk
authorSalvatore Orlando <salvatore.orlando@eu.citrix.com>
Thu, 25 Aug 2011 22:49:10 +0000 (23:49 +0100)
committerSalvatore Orlando <salvatore.orlando@eu.citrix.com>
Thu, 25 Aug 2011 22:49:10 +0000 (23:49 +0100)
Sorted "ghost" conflict in etc/quantum.conf


Trivial merge