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
=== modified file 'debian/changelog'
--- debian/changelog 2014-08-11 13:18:04 +0000
+++ debian/changelog 2014-10-03 14:58:34 +0000
@@ -1,3 +1,15 @@
1ceilometer (2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Resynchronize with stable/icehouse (4e2c1cd) (LP: #1377136):
4 - [ccd6b98] VMware: Support secret host_password option
5 - [7ff220f] Fix tests with testtools>=0.9.39
6 - [014c41e] update default_log_levels set by ceilometer
7 - [0ba75c8] fix statistics query in postgres
8 - [4e2c1cd] fix StringIO errors in unit test
9 * d/p/fix-requirements.patch: Rebased.
10
11 -- Corey Bryant <corey.bryant@canonical.com> Fri, 03 Oct 2014 10:22:03 -0400
12
1ceilometer (2014.1.2-0ubuntu1) trusty; urgency=medium13ceilometer (2014.1.2-0ubuntu1) trusty; urgency=medium
214
3 [ Corey Bryant ]15 [ Corey Bryant ]
416
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch 2014-08-08 14:34:16 +0000
+++ debian/patches/fix-requirements.patch 2014-10-03 14:58:34 +0000
@@ -1,8 +1,6 @@
1Description: Disable pynsmp and set min version of pecan/six.1Description: Disable pynsmp and set min version of pecan/six.
2Author: Corey Bryant <corey.bryant@canonical.com>2Author: Corey Bryant <corey.bryant@canonical.com>
3Forwarded: Not needed.3Forwarded: Not needed.
4Index: ceilometer/requirements.txt
5===================================================================
6--- a/requirements.txt4--- a/requirements.txt
7+++ b/requirements.txt5+++ b/requirements.txt
8@@ -16,8 +16,7 @@6@@ -16,8 +16,7 @@
@@ -22,5 +20,5 @@
22-six>=1.6.020-six>=1.6.0
23+six>=1.5.221+six>=1.5.2
24 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.9922 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
25 sqlalchemy-migrate>=0.8.2,!=0.8.423 sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
26 stevedore>=0.1424 stevedore>=0.14

Subscribers

People subscribed via source and target branches