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

Proposed by Corey Bryant on 2014-10-03
Status: Merged
Approved by: Chuck Short on 2014-10-03
Approved revision: 105
Merged at revision: 105
Proposed branch: lp:~corey.bryant/ceilometer/2014.1.3
Merge into: lp:~ubuntu-server-dev/ceilometer/icehouse
Diff against target: 39 lines (+13/-3)
2 files modified
debian/changelog (+12/-0)
debian/patches/fix-requirements.patch (+1/-3)
To merge this branch: bzr merge lp:~corey.bryant/ceilometer/2014.1.3
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-10-03 Pending
Review via email: mp+237085@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-08-11 13:18:04 +0000
3+++ debian/changelog 2014-10-03 14:58:34 +0000
4@@ -1,3 +1,15 @@
5+ceilometer (2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (4e2c1cd) (LP: #1377136):
8+ - [ccd6b98] VMware: Support secret host_password option
9+ - [7ff220f] Fix tests with testtools>=0.9.39
10+ - [014c41e] update default_log_levels set by ceilometer
11+ - [0ba75c8] fix statistics query in postgres
12+ - [4e2c1cd] fix StringIO errors in unit test
13+ * d/p/fix-requirements.patch: Rebased.
14+
15+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 03 Oct 2014 10:22:03 -0400
16+
17 ceilometer (2014.1.2-0ubuntu1) trusty; urgency=medium
18
19 [ Corey Bryant ]
20
21=== modified file 'debian/patches/fix-requirements.patch'
22--- debian/patches/fix-requirements.patch 2014-08-08 14:34:16 +0000
23+++ debian/patches/fix-requirements.patch 2014-10-03 14:58:34 +0000
24@@ -1,8 +1,6 @@
25 Description: Disable pynsmp and set min version of pecan/six.
26 Author: Corey Bryant <corey.bryant@canonical.com>
27 Forwarded: Not needed.
28-Index: ceilometer/requirements.txt
29-===================================================================
30 --- a/requirements.txt
31 +++ b/requirements.txt
32 @@ -16,8 +16,7 @@
33@@ -22,5 +20,5 @@
34 -six>=1.6.0
35 +six>=1.5.2
36 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
37- sqlalchemy-migrate>=0.8.2,!=0.8.4
38+ sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
39 stevedore>=0.14

Subscribers

People subscribed via source and target branches