Merge lp:~corey.bryant/ceilometer/2014.1.4 into lp:~ubuntu-server-dev/ceilometer/icehouse

[Corey Bryant]

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-03 20:02:09 +0000
+++ debian/changelog	2015-03-16 20:10:03 +0000
@@ -1,3 +1,16 @@
+ceilometer (2014.1.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (c837d83) (LP: #1432608):
+    - [bc9013b] Transform sample_cnt type to int
+    - [449f9d5] Move oslo.vmware higher in requirements.txt
+    - [28f5027] Fix listener for update.start notifications
+    - [63d934b] ensure dispatcher service is configured before rpc
+    - [2a546ac] Fix a response header bug in the error middleware
+    - [c837d83] Iterates swift response earlier to get the correct status
+  * d/p/fix-requirements.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Mon, 16 Mar 2015 13:08:42 -0400
+
 ceilometer (2014.1.3-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-10-03 14:41:10 +0000
+++ debian/patches/fix-requirements.patch	2015-03-16 20:10:03 +0000
@@ -3,22 +3,22 @@
 Forwarded: Not needed.
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -16,8 +16,7 @@
- oslo.config>=1.2.0
- oslo.vmware>=0.2                        # Apache-2.0
+@@ -18,8 +18,7 @@
+ netaddr>=0.7.6
+ oslo.config>=1.2.0,<1.5
  pbr>=0.6,<1.0
 -pecan>=0.4.5
 -pysnmp>=4.2.1,<5.0.0
 +pecan>=0.3.0
- python-ceilometerclient>=1.0.6
- python-glanceclient>=0.9.0
- python-keystoneclient>=0.7.0
-@@ -26,7 +25,7 @@
+ python-ceilometerclient>=1.0.6,<=1.0.12
+ python-glanceclient>=0.9.0,!=0.14.0,<=0.14.2
+ python-keystoneclient>=0.7.0,<=0.11.2
+@@ -28,7 +27,7 @@
  pytz>=2010h
  PyYAML>=3.1.0
  requests>=1.1
 -six>=1.6.0
 +six>=1.5.2
  SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
- sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
- stevedore>=0.14
+ sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
+ stevedore>=0.14,<1.2