Merge branch 'debian/unstable' of ssh://git.debian.org/git/openstack/ceilometer into...

Rewritten-From: 85aae39d8e8f6a2505e441b8dce795c4e1f01f7b

diff --combined trusty/debian/changelog
index fe5d8d2d49da51c1a2f79e402402240948d23c35,15562e3485976f02709fee0dab5a395abd88879d..45d65cb75e6625c1b35b30152963e38762f777e0
--- 1/trusty/debian/changelog
--- 2/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@@ -1,10 -1,3 +1,10 @@@
 +ceilometer (2013.1.1-2) UNRELEASED; urgency=low
 +
 +  * Added configuration to each init scripts so that they log in their own log
 +    file, added the corresponding purge postrm and logrotate.
 +
 + -- Thomas Goirand <zigo@debian.org>  Mon, 03 Jun 2013 16:26:14 +0800
 +
  ceilometer (2013.1.1-1) unstable; urgency=low
  
    * New upstream release.
@@@ -14,6 -7,7 +14,7 @@@
    * Replaced pkgos_var_user_group nova by pkgos_adduser, as we don't want to
      create the log / lib dirs of nova (Closes: #709876).
    * Creates the correct libvirt group if the package is installed in Ubuntu.
+   * Bumped Standard-Version to 3.9.4.
  
   -- Thomas Goirand <zigo@debian.org>  Mon, 27 May 2013 11:07:59 +0800