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

Proposed by Chuck Short on 2013-01-29
Status: Merged
Approved by: Yolanda Robla on 2013-01-29
Approved revision: 20
Merged at revision: 20
Proposed branch: lp:~zulcss/python-cinderclient/testr
Merge into: lp:~ubuntu-server-dev/python-cinderclient/grizzly
Diff against target: 35 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~zulcss/python-cinderclient/testr
Reviewer Review Type Date Requested Status
Yolanda Robla (community) 2013-01-29 Approve on 2013-01-29
Review via email: mp+145419@code.launchpad.net

Description of the change

Fixes ftbfs.

To post a comment you must log in.
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-01-10 19:37:50 +0000
+++ debian/changelog 2013-01-29 15:53:57 +0000
@@ -1,3 +1,10 @@
1python-cinderclient (1:1.0.2.11.gf0a6dee-0ubuntu1) UNRELEASED; urgency=low
2
3 * New upstream release.
4 * debian/control: Drop python-nose in favor of testrepository.
5
6 -- Chuck Short <zulcss@ubuntu.com> Tue, 29 Jan 2013 09:45:06 -0600
7
1python-cinderclient (1:1.0.2.3.g61e2a42-0ubuntu1) raring; urgency=low8python-cinderclient (1:1.0.2.3.g61e2a42-0ubuntu1) raring; urgency=low
29
3 [ Adam Gandelman ]10 [ Adam Gandelman ]
411
=== modified file 'debian/control'
--- debian/control 2013-01-03 13:36:52 +0000
+++ debian/control 2013-01-29 15:53:57 +0000
@@ -4,7 +4,6 @@
4Maintainer: Chuck Short <zulcss@ubuntu.com>4Maintainer: Chuck Short <zulcss@ubuntu.com>
5Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6),5Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6),
6 python-setuptools,6 python-setuptools,
7 python-nose,
8 python-httplib2,7 python-httplib2,
9 python-requests,8 python-requests,
10 python-prettytable,9 python-prettytable,
@@ -15,7 +14,8 @@
15 python-unittest2,14 python-unittest2,
16 python-setuptools-git (>= 0.4),15 python-setuptools-git (>= 0.4),
17 python-testtools,16 python-testtools,
18 python-fixtures17 python-fixtures,
18 testrepository
19Standards-Version: 3.9.319Standards-Version: 3.9.3
20X-Python-Version: >= 2.520X-Python-Version: >= 2.5
2121

Subscribers

People subscribed via source and target branches