Merge lp:~zulcss/python-ceilometerclient/keystone-ftbfs into lp:~ubuntu-server-dev/python-ceilometerclient/havana

Proposed by Chuck Short
Status: Merged
Approved by: Adam Gandelman
Approved revision: 15
Merged at revision: 15
Proposed branch: lp:~zulcss/python-ceilometerclient/keystone-ftbfs
Merge into: lp:~ubuntu-server-dev/python-ceilometerclient/havana
Diff against target: 40 lines (+7/-16)
3 files modified
debian/changelog (+7/-0)
debian/patches/fix-keystoneclient-version.patch (+0/-15)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~zulcss/python-ceilometerclient/keystone-ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+177680@code.launchpad.net

Description of the change

fixes ftbfs

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 2013-07-22 11:52:03 +0000
3+++ debian/changelog 2013-07-30 20:07:26 +0000
4@@ -1,3 +1,10 @@
5+python-ceilometerclient (1.0.2-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release.
8+ * debian/patches/fix-keystoneclient-version.patch: Dropped no longer needed.
9+
10+ -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Jul 2013 19:52:04 +0000
11+
12 python-ceilometerclient (1.0.1-0ubuntu2) saucy; urgency=low
13
14 [ Chuck Short ]
15
16=== removed file 'debian/patches/fix-keystoneclient-version.patch'
17--- debian/patches/fix-keystoneclient-version.patch 2013-07-22 11:52:03 +0000
18+++ debian/patches/fix-keystoneclient-version.patch 1970-01-01 00:00:00 +0000
19@@ -1,15 +0,0 @@
20-Description: Remove upper limit on keystoneclient
21- This has already landed in trunk; gets Ubuntu through until next upstream
22- release.
23-Author: James Page <james.page@ubuntu.com>
24-Forwarded: not-needed
25----
26-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
27---- a/requirements.txt
28-+++ b/requirements.txt
29-@@ -3,4 +3,4 @@ argparse
30- httplib2
31- iso8601>=0.1.4
32- prettytable>=0.6,<0.8
33--python-keystoneclient>=0.2,<0.3
34-+python-keystoneclient>=0.2
35
36=== removed file 'debian/patches/series'
37--- debian/patches/series 2013-07-22 11:52:03 +0000
38+++ debian/patches/series 1970-01-01 00:00:00 +0000
39@@ -1,1 +0,0 @@
40-fix-keystoneclient-version.patch

Subscribers

People subscribed via source and target branches