Merge branch 'debian/kilo' of git+ssh://git.debian.org/git/openstack/ceilometer into...
authorThomas Goirand <zigo@debian.org>
Thu, 4 Jun 2015 09:10:24 +0000 (11:10 +0200)
committerThomas Goirand <zigo@debian.org>
Thu, 4 Jun 2015 09:10:24 +0000 (11:10 +0200)
commit6d856dd49deffdd0cedfae8e878c8ca0db670c35
tree73cd9c9f6bbd32e5b6f555168ab509ffc4c1f025
parent3de83e461a841d24d7d9a51700ffaeffd855943e
parentc7f1c9ea88ce8cf140e997fc7c0f2d14b63131b6
Merge branch 'debian/kilo' of git+ssh://git.debian.org/git/openstack/ceilometer into debian/kilo

Rewritten-From: f53b9a5ba3243174d861ecadf35f052dfc3bf5d2