Merge lp:~gandelman-a/ubuntu/raring/python-keystoneclient/1170828 into lp:~openstack-ubuntu-testing/python-keystoneclient/grizzly

Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 62
Merged at revision: 62
Proposed branch: lp:~gandelman-a/ubuntu/raring/python-keystoneclient/1170828
Merge into: lp:~openstack-ubuntu-testing/python-keystoneclient/grizzly
Diff against target: 35 lines (+8/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/python-keystoneclient/1170828
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+159915@code.launchpad.net
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
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-19 13:19:45 +0000
+++ debian/changelog 2013-04-20 03:37:28 +0000
@@ -1,3 +1,9 @@
1python-keystoneclient (1:0.2.3-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/control: Set python-requests min. version >= 1.1.0. (LP: #1170828)
4
5 -- Adam Gandelman <adamg@ubuntu.com> Fri, 19 Apr 2013 20:34:03 -0700
6
1python-keystoneclient (1:0.2.3-0ubuntu1) raring; urgency=low7python-keystoneclient (1:0.2.3-0ubuntu1) raring; urgency=low
28
3 [ Chuck Short ]9 [ Chuck Short ]
410
=== modified file 'debian/control'
--- debian/control 2013-03-19 13:10:40 +0000
+++ debian/control 2013-04-20 03:37:28 +0000
@@ -15,7 +15,7 @@
15 python-mox,15 python-mox,
16 python-nose,16 python-nose,
17 python-prettytable,17 python-prettytable,
18 python-requests,18 python-requests (>= 1.1.0),
19 python-setuptools,19 python-setuptools,
20 python-simplejson,20 python-simplejson,
21 python-testtools,21 python-testtools,
@@ -26,7 +26,7 @@
26Architecture: all26Architecture: all
27Depends: python-iso8601,27Depends: python-iso8601,
28 python-pkg-resources,28 python-pkg-resources,
29 python-requests,29 python-requests (>= 1.1.0),
30 ${misc:Depends},30 ${misc:Depends},
31 ${python:Depends}31 ${python:Depends}
32Description: Client library for OpenStack Identity API32Description: Client library for OpenStack Identity API

Subscribers

People subscribed via source and target branches