Merge lp:~james-page/ceilometer/requirements-fixup-pecan into lp:~ubuntu-server-dev/ceilometer/icehouse

Proposed by James Page on 2014-05-16
Status: Merged
Approved by: Chuck Short on 2014-05-16
Approved revision: 103
Merged at revision: 102
Proposed branch: lp:~james-page/ceilometer/requirements-fixup-pecan
Merge into: lp:~ubuntu-server-dev/ceilometer/icehouse
Diff against target: 39 lines (+13/-5)
2 files modified
debian/changelog (+7/-0)
debian/patches/fix-requirements.patch (+6/-5)
To merge this branch: bzr merge lp:~james-page/ceilometer/requirements-fixup-pecan
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-05-16 Pending
Review via email: mp+219871@code.launchpad.net
To post a comment you must log in.

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-04-17 09:32:37 +0000
3+++ debian/changelog 2014-05-16 16:12:48 +0000
4@@ -1,3 +1,10 @@
5+ceilometer (2014.1-0ubuntu1.1) trusty; urgency=medium
6+
7+ * d/p/fix-requirements.patch: Drop required version of pecan to 0.3.0
8+ inline with the version that is provided in 14.04 (LP: #1317147).
9+
10+ -- James Page <james.page@ubuntu.com> Fri, 16 May 2014 12:11:00 -0400
11+
12 ceilometer (2014.1-0ubuntu1) trusty; urgency=medium
13
14 * New upstream release (LP: #1299055).
15
16=== modified file 'debian/patches/fix-requirements.patch'
17--- debian/patches/fix-requirements.patch 2014-04-08 19:42:00 +0000
18+++ debian/patches/fix-requirements.patch 2014-05-16 16:12:48 +0000
19@@ -1,14 +1,15 @@
20 Description: Disabled pynsmp.
21 Author: Chuck Short <zulcss@ubuntu.com>
22 Forwarded: Not needed.
23-diff -Naurp ceilometer-2014.1.rc2.orig/requirements.txt ceilometer-2014.1.rc2/requirements.txt
24---- ceilometer-2014.1.rc2.orig/requirements.txt 2014-04-08 15:15:38.000000000 -0400
25-+++ ceilometer-2014.1.rc2/requirements.txt 2014-04-08 15:35:42.657859030 -0400
26-@@ -17,7 +17,6 @@ oslo.config>=1.2.0
27+--- a/requirements.txt
28++++ b/requirements.txt
29+@@ -16,8 +16,7 @@ netaddr>=0.7.6
30+ oslo.config>=1.2.0
31 oslo.vmware>=0.2 # Apache-2.0
32 pbr>=0.6,<1.0
33- pecan>=0.4.5
34+-pecan>=0.4.5
35 -pysnmp>=4.2.1,<5.0.0
36++pecan>=0.3.0
37 python-ceilometerclient>=1.0.6
38 python-glanceclient>=0.9.0
39 python-keystoneclient>=0.7.0

Subscribers

People subscribed via source and target branches