Merge lp:~yolanda.robla/ceilometer/grizzly into lp:~openstack-ubuntu-testing/ceilometer/grizzly

[Yolanda Robla]

Copying pipeline.yaml to config directory

[James Page (james-page)]

review: Approve

[lp:~yolanda.robla/ceilometer/grizzly]

19. By Yolanda Robla on 2013-03-05

  Yolanda Robla 2013-03-04 d/control: fixed typo (LP: #1140309)
    Yolanda Robla 2013-03-04 consolidating changelog
    Yolanda Robla 2013-03-04 [ Yolanda Robla ]
    Yolanda Robla 2013-03-04 d/files: copying pipeline.yaml

=== modified file 'debian/ceilometer-common.install'
--- debian/ceilometer-common.install	2013-02-05 12:07:07 +0000
+++ debian/ceilometer-common.install	2013-03-04 14:22:22 +0000
@@ -2,4 +2,5 @@
 etc/ceilometer/ceilometer.conf etc/ceilometer
 etc/ceilometer/policy.json etc/ceilometer
 etc/ceilometer/sources.json etc/ceilometer
+etc/ceilometer/pipeline.yaml etc/ceilometer
 usr/bin/ceilometer-dbsync

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-01 18:25:18 +0000
+++ debian/changelog	2013-03-04 14:22:22 +0000
@@ -1,20 +1,21 @@
-ceilometer (2013.1~g2~20130107.449-0ubuntu3) UNRELEASED; urgency=low
-
-  [ Yolanda Robla ]
-  * d/control: moved mongo recommends to api and collector
-    packages (LP: #1131627)
-  * d/control: refreshed dependencies
-
-  [ James Page ]
-  * Added watch file.
+ceilometer (2013.1~g2~20130107.449-0ubuntu1) UNRELEASED; urgency=low
 
   [ Chuck Short ]
+  * New upstream release. 
+  * debian/watch: point to the right releases.
+  * debian/rules: Enable testsuite.
+  * debian/control: Update dependencies.
+  * debian/patches/remove-unwanted-dependencies.patch: Remove mongodb dependencies.
+  * debian/ceilometer-agent-compute.postinst: Add smarts to 
+    configure users after install.
+  * debian/ceilometer-common.postinst: Configure ceilometer db.
+  * debian/ceilometer-common.install: Install configuration files.
+  * debian/*.usptart: Update and use start-stop-daemon.
   * debian/patches/exclude-tests-when-isntall.patch: Exclude tests so it
     doesnt conflict with python-boto (LP: #1102110)
 
- -- Yolanda Robla <[e-mail]>  Fri, 22 Feb 2013 10:42:00 +0100
-
-ceilometer (2013.1~g2~20130107.449-0ubuntu2) UNRELEASED; urgency=low
+  [ James Page ]
+  * Added watch file.
 
   [ Yolanda Robla ]
   * d/patches: removed unused patches
@@ -25,23 +26,13 @@
   * d/control: updated dependencies
   * d/*.upstart: fixed upstart jobs
   * d/pydist-overrides: correcting pymongo and wsme package names
-
- -- Yolanda Robla <[e-mail]>  Wed, 06 Feb 2013 17:42:00 +0100
-
-ceilometer (2013.1~g2~20130107.449-0ubuntu1) UNRELEASED; urgency=low
-
-  * New upstream release. 
-  * debian/watch: point to the right releases.
-  * debian/rules: Enable testsuite.
-  * debian/control: Update dependencies.
-  * debian/patches/remove-unwanted-dependencies.patch: Remove mongodb dependencies.
-  * debian/ceilometer-agent-compute.postinst: Add smarts to 
-    configure users after install.
-  * debian/ceilometer-common.postinst: Configure ceilometer db.
-  * debian/ceilometer-common.install: Install configuration files.
-  * debian/*.usptart: Update and use start-stop-daemon.
-
- -- Chuck Short <[e-mail]>  Tue, 08 Jan 2013 07:52:53 -0600
+  * d/control: moved mongo recommends to api and collector
+    packages (LP: #1131627)
+  * d/control: refreshed dependencies
+  * d/files: copying pipeline.yaml
+  * d/control: fixed typo (LP: #1140309)
+
+ -- Yolanda Robla <[e-mail]>  Mon, 04 Mar 2013 10:46:00 +0100
 
 ceilometer (0.1-0ubuntu1) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-02-22 11:47:00 +0000
+++ debian/control	2013-03-04 14:22:22 +0000
@@ -87,7 +87,7 @@
 Architecture: all
 Depends: ceilometer-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
 Recommends: mongodb
-Description: ceioleter collector service
+Description: ceilometer collector service
  Ceilometer aims to deliver a unique point of contact for billing systems to
  aquire all counters they need to establish  customer billing, accross all 
  current and future OpenStack components. The delivery of counters must 
@@ -103,7 +103,7 @@
 Architecture: all
 Depends: ceilometer-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
 Recommends: mongodb
-Description: ceioleter api service
+Description: ceilometer api service
  Ceilometer aims to deliver a unique point of contact for billing systems to
  aquire all counters they need to establish  customer billing, accross all 
  current and future OpenStack components. The delivery of counters must 
@@ -116,7 +116,7 @@
 Package: ceilometer-agent-compute
 Architecture: all
 Depends: ceilometer-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Description: ceioleter compute agent
+Description: ceilometer compute agent
  Ceilometer aims to deliver a unique point of contact for billing systems to
  aquire all counters they need to establish  customer billing, accross all 
  current and future OpenStack components. The delivery of counters must