Merge lp:~zulcss/python-cinderclient/requsts-ftbfs into lp:~ubuntu-server-dev/python-cinderclient/grizzly

Proposed by Chuck Short
Status: Merged
Approved by: Adam Gandelman
Approved revision: 15
Merged at revision: 15
Proposed branch: lp:~zulcss/python-cinderclient/requsts-ftbfs
Merge into: lp:~ubuntu-server-dev/python-cinderclient/grizzly
Diff against target: 40 lines (+6/-2)
2 files modified
debian/changelog (+4/-1)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~zulcss/python-cinderclient/requsts-ftbfs
Reviewer Review Type Date Requested Status
Adam Gandelman (community) Approve
Review via email: mp+141662@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Adam Gandelman (gandelman-a) wrote :

Changelog states its only added as build dependency, but its added as both a build and run time dependency. LGTM otherwise.

review: Approve

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 2012-12-10 18:24:05 +0000
3+++ debian/changelog 2013-01-02 19:45:28 +0000
4@@ -1,4 +1,4 @@
5-python-cinderclient (1:1.0.1.2.g9201cee-0ubuntu1) UNRELEASED; urgency=low
6+python-cinderclient (1:1.0.2-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Chuck Short ]
9 * New upstream release.
10@@ -7,6 +7,9 @@
11 * debian/control: add python-setuptools-git dependency
12 * debian/copyright: Removed remaining dh boilerplate template.
13
14+ [ Chuck Short ]
15+ * debian/control: Add python-requests as a build dep
16+
17 -- Yolanda Robla <yolanda.robla@canonical.com> Mon, 10 Dec 2012 17:02:00 +0100
18
19 python-cinderclient (1:1.0.0-0ubuntu1) quantal; urgency=low
20
21=== modified file 'debian/control'
22--- debian/control 2012-12-10 17:39:33 +0000
23+++ debian/control 2013-01-02 19:45:28 +0000
24@@ -6,6 +6,7 @@
25 python-setuptools,
26 python-nose,
27 python-httplib2,
28+ python-requests,
29 python-prettytable,
30 python-simplejson,
31 python-mock,
32@@ -19,7 +20,7 @@
33 Package: python-cinderclient
34 Architecture: all
35 Depends: ${python:Depends}, ${misc:Depends}, python-httplib2,
36- python-prettytable, python-simplejson
37+ python-prettytable, python-requests, python-simplejson
38 Description: python bindings to the OpenStack Volume API
39 This is a client for the OpenStack Volume API. There's a Python API (the
40 ``cinderclient`` module), and a command-line script (``cinder``). Each

Subscribers

People subscribed via source and target branches