Ubuntu
python-cinderclient package

Merge lp:~gandelman-a/ubuntu/saucy/python-cinderclient/refresh into lp:~ubuntu-server-dev/python-cinderclient/havana

  1. Saucy (13.10)
  2. refresh
  3. Merge into havana
Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 33
Merged at revision: 33
Proposed branch: lp:~gandelman-a/ubuntu/saucy/python-cinderclient/refresh
Merge into: lp:~ubuntu-server-dev/python-cinderclient/havana
Diff against target: 23 lines (+6/-5)
1 file modified
debian/patches/fix-requirements.patch (+6/-5)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/python-cinderclient/refresh
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+179219@code.launchpad.net

Description of the change

Patch refresh.

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/patches/fix-requirements.patch'
2--- debian/patches/fix-requirements.patch 2013-07-18 13:51:53 +0000
3+++ debian/patches/fix-requirements.patch 2013-08-08 16:04:58 +0000
4@@ -1,13 +1,14 @@
5 Description: Remove uperbound limit for requests.
6 Author: Chuck Short <zulcss@ubuntu.com>
7 Forwarded: No
8-diff -Naurp python-cinderclient-1.0.4.66.g509a54b.orig/requirements.txt python-cinderclient-1.0.4.66.g509a54b/requirements.txt
9---- python-cinderclient-1.0.4.66.g509a54b.orig/requirements.txt 2013-07-17 08:21:14.000000000 -0400
10-+++ python-cinderclient-1.0.4.66.g509a54b/requirements.txt 2013-07-17 09:04:26.781486565 -0400
11-@@ -2,6 +2,6 @@ d2to1>=0.2.10,<0.3
12+Index: python-cinderclient/requirements.txt
13+===================================================================
14+--- python-cinderclient.orig/requirements.txt 2013-08-08 16:46:15.000000000 +0100
15++++ python-cinderclient/requirements.txt 2013-08-08 16:47:14.353344450 +0100
16+@@ -1,6 +1,6 @@
17 pbr>=0.5.16,<0.6
18 argparse
19- prettytable>=0.6,<0.8
20+ PrettyTable>=0.6,<0.8
21 -requests>=1.1,<1.2.3
22 +requests>=1.1
23 simplejson>=2.0.9

Subscribers

People subscribed via source and target branches