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

[Corey Bryant]

[lp:~corey.bryant/ceilometer/2014.1.2]

104. By Corey Bryant on 2014-08-08

* Resynchronize with stable/icehouse (2b6454f) (LP: #1354159):
  - [e491837] Set python hash seed to 0 in tox.ini
  - [99b7ef8] Update ensure()/reconnect() to catch MessagingError
  - [af1eb64] Sync RPC module from oslo, fixing reconnect failures
  - [47770db] Adds Content-Type to alarm REST notifier
  - [4be8616] Remove low-value logging from publication codepath
  - [096106f] Ensure routing key is specified in the address for a direct producer
  - [2b6454f] remove token from notifier middleware
* d/p/fix-requirements.patch: Refresh.

[Chuck Short (zulcss)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-13 14:57:39 +0000
+++ debian/changelog	2014-08-08 14:40:47 +0000
@@ -1,3 +1,17 @@
+ceilometer (2014.1.2-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (2b6454f) (LP: #1354159):
+    - [e491837] Set python hash seed to 0 in tox.ini
+    - [99b7ef8] Update ensure()/reconnect() to catch MessagingError
+    - [af1eb64] Sync RPC module from oslo, fixing reconnect failures
+    - [47770db] Adds Content-Type to alarm REST notifier
+    - [4be8616] Remove low-value logging from publication codepath
+    - [096106f] Ensure routing key is specified in the address for a direct producer
+    - [2b6454f] remove token from notifier middleware
+  * d/p/fix-requirements.patch: Refresh.
+
+ -- Corey Bryant <[e-mail]>  Thu, 07 Aug 2014 21:57:17 -0400
+
 ceilometer (2014.1.1-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (a1ec218) (LP: #1328134):

=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2014-08-08 14:40:47 +0000
@@ -0,0 +1,26 @@
+Description: Disable pynsmp and set min version of pecan/six.
+Author: Corey Bryant <[e-mail]>
+Forwarded: Not needed.
+Index: ceilometer/requirements.txt
+===================================================================
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -16,8 +16,7 @@
+ oslo.config>=1.2.0
+ oslo.vmware>=0.2                        # Apache-2.0
+ 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 @@
+ 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
+ stevedore>=0.14

=== removed file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-06-13 14:57:39 +0000
+++ debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-Description: Disable pynsmp and set min version of pecan/six.
-Author: Corey Bryant <[e-mail]>
-Forwarded: Not needed.
-Index: ceilometer/requirements.txt
-===================================================================
---- ceilometer.orig/requirements.txt	2014-06-13 10:13:20.380556854 -0400
-+++ ceilometer/requirements.txt	2014-06-13 10:42:20.980503789 -0400
-@@ -16,8 +16,7 @@
- oslo.config>=1.2.0
- oslo.vmware>=0.2                        # Apache-2.0
- 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 @@
- pytz>=2010h
- PyYAML>=3.1.0
- requests>=1.1
--six>=1.6.0
-+six>=1.5.2
- SQLAlchemy>=0.7.8,<=0.9.99
- sqlalchemy-migrate>=0.8.2,!=0.8.4
- stevedore>=0.14

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-20 16:54:07 +0000
+++ debian/patches/series	2014-08-08 14:40:47 +0000
@@ -1,2 +1,2 @@
+fix-requirements.patch
 default-dbconnection-sqlite.patch
-fix-requirements.patch