Ceilometer

Merge lp:~corey.bryant/ceilometer/kilo-3 into lp:~ubuntu-server-dev/ceilometer/kilo

  1. kilo-3
  2. Merge into kilo
Proposed by Corey Bryant
Status: Merged
Merged at revision: 138
Proposed branch: lp:~corey.bryant/ceilometer/kilo-3
Merge into: lp:~ubuntu-server-dev/ceilometer/kilo
Diff against target: 154 lines (+31/-21)
3 files modified
debian/changelog (+8/-2)
debian/control (+21/-17)
debian/patches/skip-test.patch (+2/-2)
To merge this branch: bzr merge lp:~corey.bryant/ceilometer/kilo-3
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+253723@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 2015-03-19 12:10:24 +0000
3+++ debian/changelog 2015-03-20 18:04:35 +0000
4@@ -1,8 +1,14 @@
5-ceilometer (2015.1~b2-0ubuntu2) UNRELEASED; urgency=medium
6+ceilometer (2015.1~b3-0ubuntu1) UNRELEASED; urgency=medium
7
8+ [ James Page ]
9 * d/pydist-overrides: Add overrides for oslo packages.
10
11- -- James Page <james.page@ubuntu.com> Thu, 19 Mar 2015 12:10:19 +0000
12+ [ Corey Bryant ]
13+ * New upstream release.
14+ - d/control: Align with upstream dependencies.
15+ - d/p/skip-test.patch: Rebased.
16+
17+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 20 Mar 2015 13:58:20 -0400
18
19 ceilometer (2015.1~b2-0ubuntu1) vivid; urgency=medium
20
21
22=== modified file 'debian/control'
23--- debian/control 2015-02-19 15:01:33 +0000
24+++ debian/control 2015-03-20 18:04:35 +0000
25@@ -25,30 +25,32 @@
26 python-iso8601 (>= 0.1.9),
27 python-jsonpath-rw (>= 1.2.0),
28 python-jsonschema (>= 2.0.0),
29- python-keystoneclient (>= 1:1.0.0),
30+ python-kafka (>= 0.9.2),
31+ python-keystoneclient (>= 1:1.1.0),
32 python-keystonemiddleware (>= 1.0.0),
33 python-lockfile (>= 0.8),
34 python-lxml (>= 2.3),
35- python-migrate (>= 0.9.1),
36+ python-migrate (>= 0.9.5),
37 python-mock (>= 1.0),
38 python-mox (>= 0.5.3),
39 python-msgpack (>= 0.4.0),
40 python-mysqldb,
41 python-netaddr (>= 0.7.12),
42- python-neutronclient (>= 1:2.3.6),
43+ python-neutronclient (>= 1:2.3.11),
44 python-nose,
45 python-novaclient (>= 1:2.18.0),
46 python-oslo-concurrency (>= 1.4.1),
47- python-oslo-context (>= 0.1.0),
48- python-oslo-config (>= 1:1.6.0),
49- python-oslo-db (>= 1.4.1),
50+ python-oslo-config (>= 1:1.9.0),
51+ python-oslo-context (>= 0.2.0),
52+ python-oslo-db (>= 1.5.0),
53 python-oslo-i18n (>= 1.3.0),
54 python-oslo-messaging (>= 1.6.0),
55 python-oslo-middleware (>= 0.3.0),
56+ python-oslo-policy (>= 0.3.0),
57 python-oslo-rootwrap (>= 1.5.0),
58 python-oslo-serialization (>= 1.2.0),
59 python-oslo-utils (>= 1.2.0),
60- python-oslo-vmware (>= 0.9.0),
61+ python-oslo-vmware (>= 0.11.0),
62 python-oslosphinx (>= 2.2.0),
63 python-oslotest (>= 1:1.2.0),
64 python-pastedeploy (>= 1.5.0),
65@@ -60,7 +62,7 @@
66 python-pysnmp4 (>= 4.2.1),
67 python-requests (>= 2.2.0),
68 python-retrying (>= 1.2.3),
69- python-six (>= 1.7.0),
70+ python-six (>= 1.9.0),
71 python-sphinx (>= 1.1.2),
72 python-sqlalchemy (>= 0.9.7),
73 python-stevedore (>= 1.1.0),
74@@ -72,6 +74,7 @@
75 python-tooz (>= 0.3),
76 python-tz (>= 2013.6),
77 python-webob (>= 1.2.3),
78+ python-werkzeug (>= 0.7),
79 python-wsme (>= 0.6),
80 python-yaml (>= 3.1.0),
81 subunit,
82@@ -90,30 +93,30 @@
83 python-croniter (>= 0.3.4),
84 python-eventlet (>= 0.16.1),
85 python-glanceclient (>= 1:0.15.0),
86- python-happybase (>= 0.5),
87 python-iso8601 (>= 0.1.9),
88 python-jsonpath-rw (>= 1.2.0),
89 python-jsonschema (>= 2.0.0),
90- python-keystoneclient (>= 1:1.0.0),
91+ python-kafka (>= 0.9.2),
92+ python-keystoneclient (>= 1:1.1.0),
93 python-keystonemiddleware (>= 1.0.0),
94 python-lockfile (>= 0.8),
95 python-lxml (>= 2.3),
96- python-migrate (>= 0.9.1),
97+ python-migrate (>= 0.9.5),
98 python-msgpack (>= 0.4.0),
99 python-netaddr (>= 0.7.12),
100- python-neutronclient (>= 1:2.3.6),
101+ python-neutronclient (>= 1:2.3.11),
102 python-novaclient (>= 1:2.18.0),
103 python-oslo-concurrency (>= 1.4.1),
104- python-oslo-context (>= 0.1.0),
105- python-oslo-config (>= 1:1.6.0),
106- python-oslo-db (>= 1.4.1),
107+ python-oslo-context (>= 0.2.0),
108+ python-oslo-config (>= 1:1.9.0),
109+ python-oslo-db (>= 1.5.0),
110 python-oslo-i18n (>= 1.3.0),
111 python-oslo-messaging (>= 1.6.0),
112 python-oslo-middleware (>= 0.3.0),
113+ python-oslo-policy (>= 0.3.0),
114 python-oslo-rootwrap (>= 1.5.0),
115 python-oslo-serialization (>= 1.2.0),
116 python-oslo-utils (>= 1.2.0),
117- python-oslo-vmware (>= 0.9.0),
118 python-pastedeploy (>= 1.5.0),
119 python-pbr (>= 0.6),
120 python-pecan (>= 0.8.0),
121@@ -121,13 +124,14 @@
122 python-pysnmp4 (>= 4.2.1),
123 python-retrying (>= 1.2.3),
124 python-requests (>= 2.2.0),
125- python-six (>= 1.7.0),
126+ python-six (>= 1.9.0),
127 python-sqlalchemy (>= 0.9.7),
128 python-stevedore (>= 1.1.0),
129 python-swiftclient (>= 1:2.2.0),
130 python-tooz (>= 0.3),
131 python-tz (>= 2013.6),
132 python-webob (>= 1.2.3),
133+ python-werkzeug (>= 0.7),
134 python-wsme (>= 0.6),
135 python-yaml (>= 3.1.0),
136 ${misc:Depends},
137
138=== modified file 'debian/patches/skip-test.patch'
139--- debian/patches/skip-test.patch 2015-02-16 13:55:29 +0000
140+++ debian/patches/skip-test.patch 2015-03-20 18:04:35 +0000
141@@ -1,6 +1,6 @@
142 --- a/ceilometer/tests/api/v2/test_event_scenarios.py
143 +++ b/ceilometer/tests/api/v2/test_event_scenarios.py
144-@@ -136,7 +136,10 @@
145+@@ -138,7 +138,10 @@
146 # We expect to get native UTC generated time back
147 trait_time = self.s_time
148 for event in data:
149@@ -11,4 +11,4 @@
150 + self.skipTest('Skipped by Ubuntu')
151 self.assertIn(event['event_type'], ['Foo', 'Bar', 'Zoo'])
152 self.assertEqual(4, len(event['traits']))
153- self.assertEqual(expected_generated, event['generated'])
154+ self.assertEqual({'status': {'nested': 'started'}}, event['raw']),

Subscribers

People subscribed via source and target branches