Merge lp:~corey.bryant/ceilometer/2013.2.3 into lp:~ubuntu-server-dev/ceilometer/havana

Proposed by Corey Bryant on 2014-04-04
Status: Merged
Approved by: Chuck Short on 2014-04-04
Approved revision: 82
Merged at revision: 82
Proposed branch: lp:~corey.bryant/ceilometer/2013.2.3
Merge into: lp:~ubuntu-server-dev/ceilometer/havana
Diff against target: 82 lines (+23/-17)
3 files modified
debian/changelog (+22/-0)
debian/patches/fix-setup-requirements.patch (+0/-16)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/ceilometer/2013.2.3
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-04-04 Pending
Review via email: mp+214302@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-02-26 09:09:47 +0000
3+++ debian/changelog 2014-04-04 16:13:10 +0000
4@@ -1,3 +1,25 @@
5+ceilometer (2013.2.3-0ubuntu1) saucy-proposed; urgency=medium
6+
7+ * debian/patches/fix-setup-requirements.patch: Rebase on top of
8+ new upstream requirements.txt file.
9+ * Resynchronize with stable/havana (0ac6942) (LP: #1302575):
10+ - [c92c106] latest alembic imcompatible with current sqlalchemy requirements
11+ - [4ffeead] User a more accurate max_delay for reconnects
12+ - [6637acd] Checks for presence of Hyper-V cpu metrics before accessing
13+ - [7cb5f4c] Fix ceilometer.conf.sample mismatch
14+ - [ebe72d5] Fixes Hyper-V Inspector disk metrics bug
15+ - [bbab3d5] Fix validation error for invalid field name in simple query
16+ - [83a2725] Adds doc string to query validate functions in V2 API
17+ - [4461828] Ensure insecure config option propagated by alarm service
18+ - [0a1db09] Fix the default rpc policy value
19+ - [b13ee97] Ensure the correct error message is displayed
20+ - [2c6a84f] Refactor timestamp existence validation in V2 API
21+ - [ff0375c] cacert is not picked up correctly by alarm services
22+ - [0a85f22] Add an insecure option for Keystone client
23+ - [0ac6942] Propogate cacert and insecure flags to glanceclient
24+
25+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 04 Apr 2014 12:02:50 -0400
26+
27 ceilometer (2013.2.2-0ubuntu1) saucy-proposed; urgency=low
28
29 * Resynchronize with stable/havana (9149861) (LP: #1284643):
30
31=== added file 'debian/patches/fix-setup-requirements.patch'
32--- debian/patches/fix-setup-requirements.patch 1970-01-01 00:00:00 +0000
33+++ debian/patches/fix-setup-requirements.patch 2014-04-04 16:13:10 +0000
34@@ -0,0 +1,15 @@
35+Description: Bump requirements to support sqlalchemy 0.8.2
36+Author: Chuck Short <zulcss@ubuntu.com>
37+Forwarded: No
38+Index: ceilometer/requirements.txt
39+--- a/requirements.txt
40++++ b/requirements.txt
41+@@ -3,7 +3,7 @@
42+ kombu>=2.4.8
43+ iso8601>=0.1.8
44+ argparse
45+-SQLAlchemy>=0.7.8,<=0.7.99
46++SQLAlchemy>=0.7.8,<=0.8.99
47+ sqlalchemy-migrate>=0.7.2
48+ alembic>=0.4.1,<0.6.4
49+ netaddr
50
51=== removed file 'debian/patches/fix-setup-requirements.patch'
52--- debian/patches/fix-setup-requirements.patch 2013-12-18 03:51:19 +0000
53+++ debian/patches/fix-setup-requirements.patch 1970-01-01 00:00:00 +0000
54@@ -1,16 +0,0 @@
55-Description: Bump requirements to support sqlalchemy 0.8.2
56-Author: Chuck Short <zulcss@ubuntu.com>
57-Forwarded: No
58-Index: ceilometer/requirements.txt
59-===================================================================
60---- ceilometer.orig/requirements.txt 2013-12-17 19:50:28.051735156 -0800
61-+++ ceilometer/requirements.txt 2013-12-17 19:50:28.043735156 -0800
62-@@ -3,7 +3,7 @@
63- kombu>=2.4.8
64- iso8601>=0.1.8
65- argparse
66--SQLAlchemy>=0.7.8,<=0.7.99
67-+SQLAlchemy>=0.7.8,<=0.8.99
68- sqlalchemy-migrate>=0.7.2
69- alembic>=0.4.1
70- netaddr
71
72=== modified file 'debian/patches/series'
73--- debian/patches/series 2013-12-18 18:07:39 +0000
74+++ debian/patches/series 2014-04-04 16:13:10 +0000
75@@ -1,6 +1,6 @@
76+fix-setup-requirements.patch
77 default-dbconnection-sqlite.patch
78 skip-database-tests.patch
79-fix-setup-requirements.patch
80 revert-keystone-compat.patch
81 revert-keystone-compat-2.patch
82 revert-stable-havana-requirements.patch

Subscribers

People subscribed via source and target branches