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

Proposed by Corey Bryant on 2014-06-09
Status: Merged
Merged at revision: 103
Proposed branch: lp:~corey.bryant/ceilometer/2014.1.1
Merge into: lp:~ubuntu-server-dev/ceilometer/icehouse
Diff against target: 54 lines (+29/-5)
2 files modified
debian/changelog (+13/-0)
debian/patches/fix-requirements.patch (+16/-5)
To merge this branch: bzr merge lp:~corey.bryant/ceilometer/2014.1.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-06-09 Pending
Review via email: mp+222542@code.launchpad.net

Description of the change

Ubuntu Stable Release Update for OpenStack Icehouse

To post a comment you must log in.
Chuck Short (zulcss) wrote :

see comment

lp:~corey.bryant/ceilometer/2014.1.1 updated on 2014-06-13
103. By Corey Bryant on 2014-06-13

* Resynchronize with stable/icehouse (a1ec218) (LP: #1328134):
  - [84635e6] Fix testing gate due to new keystoneclient release
  - [c52904d] Fix network notifications of neutron bulk creation
  - [06eb8bc] Sync kombu_reconnect_delay from Oslo
  - [d247af3] Updated from global requirements
  - [82eed26] Disable specifying alarm itself in combination rule
  - [94c12fd] Adapt failing tests for latest wsme version
  - [a1ec218] Use known protocol scheme in keystone tests

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-05-16 16:11:19 +0000
3+++ debian/changelog 2014-06-13 16:04:11 +0000
4@@ -1,3 +1,16 @@
5+ceilometer (2014.1.1-0ubuntu1) trusty; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (a1ec218) (LP: #1328134):
8+ - [84635e6] Fix testing gate due to new keystoneclient release
9+ - [c52904d] Fix network notifications of neutron bulk creation
10+ - [06eb8bc] Sync kombu_reconnect_delay from Oslo
11+ - [d247af3] Updated from global requirements
12+ - [82eed26] Disable specifying alarm itself in combination rule
13+ - [94c12fd] Adapt failing tests for latest wsme version
14+ - [a1ec218] Use known protocol scheme in keystone tests
15+
16+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 09 Jun 2014 14:49:20 -0400
17+
18 ceilometer (2014.1-0ubuntu1.1) trusty; urgency=medium
19
20 * d/p/fix-requirements.patch: Drop required version of pecan to 0.3.0
21
22=== modified file 'debian/patches/fix-requirements.patch'
23--- debian/patches/fix-requirements.patch 2014-05-16 14:11:50 +0000
24+++ debian/patches/fix-requirements.patch 2014-06-13 16:04:11 +0000
25@@ -1,9 +1,11 @@
26-Description: Disabled pynsmp.
27-Author: Chuck Short <zulcss@ubuntu.com>
28+Description: Disable pynsmp and set min version of pecan/six.
29+Author: Corey Bryant <corey.bryant@canonical.com>
30 Forwarded: Not needed.
31---- a/requirements.txt
32-+++ b/requirements.txt
33-@@ -16,8 +16,7 @@ netaddr>=0.7.6
34+Index: ceilometer/requirements.txt
35+===================================================================
36+--- ceilometer.orig/requirements.txt 2014-06-13 10:13:20.380556854 -0400
37++++ ceilometer/requirements.txt 2014-06-13 10:42:20.980503789 -0400
38+@@ -16,8 +16,7 @@
39 oslo.config>=1.2.0
40 oslo.vmware>=0.2 # Apache-2.0
41 pbr>=0.6,<1.0
42@@ -13,3 +15,12 @@
43 python-ceilometerclient>=1.0.6
44 python-glanceclient>=0.9.0
45 python-keystoneclient>=0.7.0
46+@@ -26,7 +25,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.99
53+ sqlalchemy-migrate>=0.8.2,!=0.8.4
54+ stevedore>=0.14

Subscribers

People subscribed via source and target branches