Merge lp:~zulcss/python-keystoneclient/pbr-fixes into lp:~openstack-ubuntu-testing/python-keystoneclient/havana

Proposed by Chuck Short
Status: Merged
Merged at revision: 65
Proposed branch: lp:~zulcss/python-keystoneclient/pbr-fixes
Merge into: lp:~openstack-ubuntu-testing/python-keystoneclient/havana
Diff against target: 41 lines (+6/-2)
2 files modified
debian/changelog (+3/-1)
debian/control (+3/-1)
To merge this branch: bzr merge lp:~zulcss/python-keystoneclient/pbr-fixes
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Needs Fixing
Review via email: mp+166031@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

typo in debian/cntrol

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-04-30 12:56:53 +0000
+++ debian/changelog 2013-05-28 12:10:39 +0000
@@ -1,6 +1,8 @@
1python-keystoneclient (1:0.2.3.11.g22228f5-0ubuntu1) UNRELEASED; urgency=low1python-keystoneclient (1:0.2.3.41.gef6530d-0ubuntu1) UNRELEASED; urgency=low
22
3 * New upstream release. 3 * New upstream release.
4 * debian/control: Add python-d2to1 and python-pbr
5 * debian/cntrol: Add testrepository, dropped python-nose
46
5 -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Apr 2013 07:45:10 -05007 -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Apr 2013 07:45:10 -0500
68
79
=== modified file 'debian/control'
--- debian/control 2013-04-20 03:35:09 +0000
+++ debian/control 2013-05-28 12:10:39 +0000
@@ -6,6 +6,8 @@
6 python-all (>= 2.6.6-3~),6 python-all (>= 2.6.6-3~),
7 python-coverage,7 python-coverage,
8 python-crypto,8 python-crypto,
9 python-d2to1,
10 python-pbr,
9 python-fixtures,11 python-fixtures,
10 python-httplib2,12 python-httplib2,
11 python-keyring,13 python-keyring,
@@ -13,13 +15,13 @@
13 python-oslo.config,15 python-oslo.config,
14 python-mock,16 python-mock,
15 python-mox,17 python-mox,
16 python-nose,
17 python-prettytable,18 python-prettytable,
18 python-requests (>= 1.1.0),19 python-requests (>= 1.1.0),
19 python-setuptools,20 python-setuptools,
20 python-simplejson,21 python-simplejson,
21 python-testtools,22 python-testtools,
22 python-webob,23 python-webob,
24 testrepository
23Standards-Version: 3.9.425Standards-Version: 3.9.4
2426
25Package: python-keystoneclient27Package: python-keystoneclient

Subscribers

People subscribed via source and target branches