Merge lp:~james-page/python-cinderclient/drop-patches into lp:~ubuntu-server-dev/python-cinderclient/havana

Proposed by James Page on 2013-08-14
Status: Merged
Approved by: Adam Gandelman on 2013-08-14
Approved revision: 36
Merged at revision: 36
Proposed branch: lp:~james-page/python-cinderclient/drop-patches
Merge into: lp:~ubuntu-server-dev/python-cinderclient/havana
Diff against target: 39 lines (+6/-15)
3 files modified
debian/changelog (+6/-0)
debian/patches/fix-requirements.patch (+0/-14)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~james-page/python-cinderclient/drop-patches
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2013-08-14 Pending
Review via email: mp+180230@code.launchpad.net

Description of the change

Drop patches - no longer required.

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-08-13 14:52:36 +0000
3+++ debian/changelog 2013-08-14 20:15:35 +0000
4@@ -1,3 +1,9 @@
5+python-cinderclient (1:1.0.5-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * d/p/*: Dropped - no longer required.
8+
9+ -- James Page <james.page@ubuntu.com> Wed, 14 Aug 2013 21:04:09 +0100
10+
11 python-cinderclient (1:1.0.5-0ubuntu1) saucy; urgency=low
12
13 [ Andres Rodriguez ]
14
15=== removed directory 'debian/patches'
16=== removed file 'debian/patches/fix-requirements.patch'
17--- debian/patches/fix-requirements.patch 2013-08-13 14:52:36 +0000
18+++ debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
19@@ -1,14 +0,0 @@
20-Description: Remove uperbound limit for requests.
21-Author: Chuck Short <zulcss@ubuntu.com>
22-Forwarded: No
23-diff -Naurp python-cinderclient-1.0.5.orig/requirements.txt python-cinderclient-1.0.5/requirements.txt
24---- python-cinderclient-1.0.5.orig/requirements.txt 2013-08-06 19:15:55.000000000 -0400
25-+++ python-cinderclient-1.0.5/requirements.txt 2013-08-13 10:46:56.360611214 -0400
26-@@ -1,6 +1,6 @@
27- pbr>=0.5.16,<0.6
28- argparse
29- PrettyTable>=0.6,<0.8
30--requests>=1.1,<1.2.3
31-+requests>=1.1
32- simplejson>=2.0.9
33- six
34
35=== removed file 'debian/patches/series'
36--- debian/patches/series 2013-07-18 13:51:53 +0000
37+++ debian/patches/series 1970-01-01 00:00:00 +0000
38@@ -1,1 +0,0 @@
39-fix-requirements.patch

Subscribers

People subscribed via source and target branches