summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorHenry Nash <henryn@linux.vnet.ibm.com>2012-11-17 14:45:18 +0000
committerBrian Waldon <bcwaldon@gmail.com>2012-11-19 09:50:17 -0800
commite59360da677c4cd3f6a6391cfebb973c11e2ee47 (patch)
tree4d0d2685c709c73454af82bbb3ee4c803b0af1ab /tools
parent71692f7805b62329f7367a120700b6ed050b20b4 (diff)
downloadkeystone-e59360da677c4cd3f6a6391cfebb973c11e2ee47.tar.gz
keystone-e59360da677c4cd3f6a6391cfebb973c11e2ee47.tar.xz
keystone-e59360da677c4cd3f6a6391cfebb973c11e2ee47.zip
Import auth_token middleware from keystoneclient
Although the master auth_token file is now in keystoneclient, it will take some time to get all the paste files to point to it there rather than here. Hence, we import it back here to provide backward compatibility for a release or so, after which we will remove it from the server. Change-Id: Iccdb7839a611cdda233e4ea96f68c64d6d82f49c
Diffstat (limited to 'tools')
-rw-r--r--tools/pip-requires1
-rw-r--r--tools/test-requires1
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/pip-requires b/tools/pip-requires
index 572d5d47..ae6885bd 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -11,3 +11,4 @@ sqlalchemy-migrate>=0.7.2
passlib
lxml
iso8601>=0.1.4
+python-keystoneclient>=0.2,<0.3
diff --git a/tools/test-requires b/tools/test-requires
index cb7723e8..dd60ef22 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -20,7 +20,6 @@ distribute>=0.6.24
# for python-keystoneclient
httplib2
-python-keystoneclient>=0.1,<0.2
# swift_auth test dependencies
http://tarballs.openstack.org/swift/swift-master.tar.gz#egg=swift