Merge lp:~gandelman-a/ubuntu/saucy/cinder/keystoneclient_min into lp:~ubuntu-server-dev/cinder/havana

Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 114
Merged at revision: 114
Proposed branch: lp:~gandelman-a/ubuntu/saucy/cinder/keystoneclient_min
Merge into: lp:~ubuntu-server-dev/cinder/havana
Diff against target: 36 lines (+5/-3)
2 files modified
debian/changelog (+3/-1)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/cinder/keystoneclient_min
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+172935@code.launchpad.net

Commit message

Sets minimum keystoneclient version requirement to ensure upgrading it. This accommodates Grizzly moving auth token middleware from the projects to the client library.

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-07-02 16:20:07 +0000
+++ debian/changelog 2013-07-04 00:43:29 +0000
@@ -6,7 +6,9 @@
6 * debian/control: Add missing testrepostory.6 * debian/control: Add missing testrepostory.
77
8 [ Adam Gandelman ]8 [ Adam Gandelman ]
9 * debian/control: Add minimum requirement python-anyjson (>= 0.3.3).9 * debian/control:
10 - Add minimum requirement python-anyjson (>= 0.3.3).
11 - Add minimum requirement python-keystoneclient (>= 0.2.3).
1012
11 -- Adam Gandelman <adamg@ubuntu.com> Mon, 01 Jul 2013 18:59:19 -070013 -- Adam Gandelman <adamg@ubuntu.com> Mon, 01 Jul 2013 18:59:19 -0700
1214
1315
=== modified file 'debian/control'
--- debian/control 2013-07-02 16:20:07 +0000
+++ debian/control 2013-07-04 00:43:29 +0000
@@ -14,7 +14,7 @@
14 python-greenlet,14 python-greenlet,
15 python-hp3parclient (>= 1.0.0),15 python-hp3parclient (>= 1.0.0),
16 python-iso8601,16 python-iso8601,
17 python-keystoneclient,17 python-keystoneclient (> 0.2.3),
18 python-kombu,18 python-kombu,
19 python-lockfile,19 python-lockfile,
20 python-lxml,20 python-lxml,
@@ -51,7 +51,7 @@
51 python-anyjson (>= 0.3.3),51 python-anyjson (>= 0.3.3),
52 python-eventlet,52 python-eventlet,
53 python-glanceclient,53 python-glanceclient,
54 python-keystoneclient,54 python-keystoneclient (0.2.3),
55 python-oslo.config,55 python-oslo.config,
56 python-greenlet,56 python-greenlet,
57 python-iso8601,57 python-iso8601,

Subscribers

People subscribed via source and target branches