]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
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)
commit6e160e74b5d8b4f6fb864ce70cadb19037931a87
tree6542125175cee9edd0ffd50ae97be78fcb614b93
parent78bdaa58d2b5c5e8bc683b6518529f0b04381b6f
parentd5086c8b7985087847e762127a3b835ad4ca0c33
Merge trunk
Sorted "ghost" conflict in etc/quantum.conf