Merge lp:~thedac/ceilometer/kilo into lp:~ubuntu-server-dev/ceilometer/kilo

Proposed by David Ames on 2015-08-03
Status: Merged
Merged at revision: 148
Proposed branch: lp:~thedac/ceilometer/kilo
Merge into: lp:~ubuntu-server-dev/ceilometer/kilo
Diff against target: 40 lines (+19/-3)
2 files modified
debian/changelog (+16/-0)
debian/patches/disable-kafka.patch (+3/-3)
To merge this branch: bzr merge lp:~thedac/ceilometer/kilo
Reviewer Review Type Date Requested Status
Corey Bryant 2015-08-03 Approve on 2015-08-04
Review via email: mp+266808@code.launchpad.net

Description of the change

Resynchronize with stable/kilo (e7c2286) (LP: #1481008)

To post a comment you must log in.
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 2015-05-03 17:39:00 +0000
3+++ debian/changelog 2015-08-03 22:17:37 +0000
4@@ -1,3 +1,19 @@
5+ceilometer (2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/kilo (e7c2286) (LP: #1481008):
8+ - [6ea8dd1] Handle database failures on api startup
9+ - [95ff1fc] Mask database.event_connection details in logs
10+ - [b28a8bb] Fix the meter unit types to be consistent
11+ - [023cfd1] api: record severity change in alarm history
12+ - [349be3d] [elasticsearch] default trait type to string
13+ - [f200c54] Fixes DiskInfoPollster AttributeError exception
14+ - [76dc5d8] Update a test to properly anticipate HTTP 405 for RestController
15+ - [77b1fb5] Fixing event types pattern for Role Noti. handler
16+ - [e7c2286] stop mocking os.path in test_setup_events_default_config
17+ * d/p/disable-kafka.patch: Rebased.
18+
19+ -- David Ames <david.ames@canonical.com> Mon, 03 Aug 2015 13:37:56 -0700
20+
21 ceilometer (2015.1.0-0ubuntu1) vivid; urgency=medium
22
23 [ Corey Bryant ]
24
25=== modified file 'debian/patches/disable-kafka.patch'
26--- debian/patches/disable-kafka.patch 2015-04-30 13:34:55 +0000
27+++ debian/patches/disable-kafka.patch 2015-08-03 22:17:37 +0000
28@@ -31,9 +31,9 @@
29 +++ b/requirements.txt
30 @@ -9,7 +9,6 @@
31 iso8601>=0.1.9
32- jsonpath-rw>=1.2.0,<2.0
33- jsonschema>=2.0.0,<3.0.0
34+ jsonpath-rw<2.0,>=1.2.0
35+ jsonschema<3.0.0,>=2.0.0
36 -kafka-python>=0.9.2 # Apache-2.0
37- keystonemiddleware>=1.5.0,<1.6.0
38+ keystonemiddleware<1.6.0,>=1.5.0
39 lxml>=2.3
40 msgpack-python>=0.4.0

Subscribers

People subscribed via source and target branches