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

Subscribers

People subscribed via source and target branches