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

Proposed by Corey Bryant on 2015-03-16
Status: Merged
Merged at revision: 107
Proposed branch: lp:~corey.bryant/ceilometer/2014.1.4
Merge into: lp:~ubuntu-server-dev/ceilometer/icehouse
Diff against target: 56 lines (+22/-9)
2 files modified
debian/changelog (+13/-0)
debian/patches/fix-requirements.patch (+9/-9)
To merge this branch: bzr merge lp:~corey.bryant/ceilometer/2014.1.4
Reviewer Review Type Date Requested Status
James Page 2015-03-16 Approve on 2015-03-19
Review via email: mp+253107@code.launchpad.net
To post a comment you must log in.
James Page (james-page) :
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-10-03 20:02:09 +0000
3+++ debian/changelog 2015-03-16 20:10:03 +0000
4@@ -1,3 +1,16 @@
5+ceilometer (2014.1.4-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (c837d83) (LP: #1432608):
8+ - [bc9013b] Transform sample_cnt type to int
9+ - [449f9d5] Move oslo.vmware higher in requirements.txt
10+ - [28f5027] Fix listener for update.start notifications
11+ - [63d934b] ensure dispatcher service is configured before rpc
12+ - [2a546ac] Fix a response header bug in the error middleware
13+ - [c837d83] Iterates swift response earlier to get the correct status
14+ * d/p/fix-requirements.patch: Rebased.
15+
16+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 16 Mar 2015 13:08:42 -0400
17+
18 ceilometer (2014.1.3-0ubuntu1) trusty; urgency=medium
19
20 [ Corey Bryant ]
21
22=== modified file 'debian/patches/fix-requirements.patch'
23--- debian/patches/fix-requirements.patch 2014-10-03 14:41:10 +0000
24+++ debian/patches/fix-requirements.patch 2015-03-16 20:10:03 +0000
25@@ -3,22 +3,22 @@
26 Forwarded: Not needed.
27 --- a/requirements.txt
28 +++ b/requirements.txt
29-@@ -16,8 +16,7 @@
30- oslo.config>=1.2.0
31- oslo.vmware>=0.2 # Apache-2.0
32+@@ -18,8 +18,7 @@
33+ netaddr>=0.7.6
34+ oslo.config>=1.2.0,<1.5
35 pbr>=0.6,<1.0
36 -pecan>=0.4.5
37 -pysnmp>=4.2.1,<5.0.0
38 +pecan>=0.3.0
39- python-ceilometerclient>=1.0.6
40- python-glanceclient>=0.9.0
41- python-keystoneclient>=0.7.0
42-@@ -26,7 +25,7 @@
43+ python-ceilometerclient>=1.0.6,<=1.0.12
44+ python-glanceclient>=0.9.0,!=0.14.0,<=0.14.2
45+ python-keystoneclient>=0.7.0,<=0.11.2
46+@@ -28,7 +27,7 @@
47 pytz>=2010h
48 PyYAML>=3.1.0
49 requests>=1.1
50 -six>=1.6.0
51 +six>=1.5.2
52 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
53- sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
54- stevedore>=0.14
55+ sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
56+ stevedore>=0.14,<1.2

Subscribers

People subscribed via source and target branches