Code Review / openstack-build / ceilometer-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 5659eff 4ef6415)
Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/ceilometer into...
authorThomas Goirand <thomas@goirand.fr>
Mon, 7 Oct 2013 18:48:30 +0000 (18:48 +0000)
committerThomas Goirand <thomas@goirand.fr>
Mon, 7 Oct 2013 18:48:30 +0000 (18:48 +0000)
Conflicts:
debian/control

Rewritten-From: da0d6bd3500f6d9591aab367aeb0173b0eafe763


Trivial merge