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

Proposed by Corey Bryant on 2014-08-08
Status: Merged
Merged at revision: 104
Proposed branch: lp:~corey.bryant/ceilometer/2014.1.2
Merge into: lp:~ubuntu-server-dev/ceilometer/icehouse
Diff against target: 91 lines (+15/-27)
3 files modified
debian/changelog (+14/-0)
debian/patches/fix-requirements.patch (+0/-26)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/ceilometer/2014.1.2
Reviewer Review Type Date Requested Status
Chuck Short (community) 2014-08-08 Approve on 2014-08-08
Review via email: mp+230120@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/ceilometer/2014.1.2 updated on 2014-08-08
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-06-13 14:57:39 +0000
3+++ debian/changelog 2014-08-08 14:40:47 +0000
4@@ -1,3 +1,17 @@
5+ceilometer (2014.1.2-0ubuntu1) trusty; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (2b6454f) (LP: #1354159):
8+ - [e491837] Set python hash seed to 0 in tox.ini
9+ - [99b7ef8] Update ensure()/reconnect() to catch MessagingError
10+ - [af1eb64] Sync RPC module from oslo, fixing reconnect failures
11+ - [47770db] Adds Content-Type to alarm REST notifier
12+ - [4be8616] Remove low-value logging from publication codepath
13+ - [096106f] Ensure routing key is specified in the address for a direct producer
14+ - [2b6454f] remove token from notifier middleware
15+ * d/p/fix-requirements.patch: Refresh.
16+
17+ -- Corey Bryant <corey.bryant@canonical.com> Thu, 07 Aug 2014 21:57:17 -0400
18+
19 ceilometer (2014.1.1-0ubuntu1) trusty; urgency=medium
20
21 * Resynchronize with stable/icehouse (a1ec218) (LP: #1328134):
22
23=== added file 'debian/patches/fix-requirements.patch'
24--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
25+++ debian/patches/fix-requirements.patch 2014-08-08 14:40:47 +0000
26@@ -0,0 +1,26 @@
27+Description: Disable pynsmp and set min version of pecan/six.
28+Author: Corey Bryant <corey.bryant@canonical.com>
29+Forwarded: Not needed.
30+Index: ceilometer/requirements.txt
31+===================================================================
32+--- a/requirements.txt
33++++ b/requirements.txt
34+@@ -16,8 +16,7 @@
35+ oslo.config>=1.2.0
36+ oslo.vmware>=0.2 # Apache-2.0
37+ pbr>=0.6,<1.0
38+-pecan>=0.4.5
39+-pysnmp>=4.2.1,<5.0.0
40++pecan>=0.3.0
41+ python-ceilometerclient>=1.0.6
42+ python-glanceclient>=0.9.0
43+ python-keystoneclient>=0.7.0
44+@@ -26,7 +25,7 @@
45+ pytz>=2010h
46+ PyYAML>=3.1.0
47+ requests>=1.1
48+-six>=1.6.0
49++six>=1.5.2
50+ SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
51+ sqlalchemy-migrate>=0.8.2,!=0.8.4
52+ stevedore>=0.14
53
54=== removed file 'debian/patches/fix-requirements.patch'
55--- debian/patches/fix-requirements.patch 2014-06-13 14:57:39 +0000
56+++ debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
57@@ -1,26 +0,0 @@
58-Description: Disable pynsmp and set min version of pecan/six.
59-Author: Corey Bryant <corey.bryant@canonical.com>
60-Forwarded: Not needed.
61-Index: ceilometer/requirements.txt
62-===================================================================
63---- ceilometer.orig/requirements.txt 2014-06-13 10:13:20.380556854 -0400
64-+++ ceilometer/requirements.txt 2014-06-13 10:42:20.980503789 -0400
65-@@ -16,8 +16,7 @@
66- oslo.config>=1.2.0
67- oslo.vmware>=0.2 # Apache-2.0
68- pbr>=0.6,<1.0
69--pecan>=0.4.5
70--pysnmp>=4.2.1,<5.0.0
71-+pecan>=0.3.0
72- python-ceilometerclient>=1.0.6
73- python-glanceclient>=0.9.0
74- python-keystoneclient>=0.7.0
75-@@ -26,7 +25,7 @@
76- pytz>=2010h
77- PyYAML>=3.1.0
78- requests>=1.1
79--six>=1.6.0
80-+six>=1.5.2
81- SQLAlchemy>=0.7.8,<=0.9.99
82- sqlalchemy-migrate>=0.8.2,!=0.8.4
83- stevedore>=0.14
84
85=== modified file 'debian/patches/series'
86--- debian/patches/series 2014-03-20 16:54:07 +0000
87+++ debian/patches/series 2014-08-08 14:40:47 +0000
88@@ -1,2 +1,2 @@
89+fix-requirements.patch
90 default-dbconnection-sqlite.patch
91-fix-requirements.patch

Subscribers

People subscribed via source and target branches