summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2014-09-18 22:56:44 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2014-09-18 22:56:44 +0000
commitd281bd25461eda49963522a5bf2583b84bb7d147 (patch)
treee34b3d70cca16569e6323a83c93c09444b93312c
parentc6baddc6ac7c6e81fe32ef55d009d02842fe1477 (diff)
downloadkeystonemiddleware-d281bd25461eda49963522a5bf2583b84bb7d147.tar.gz
Updated from global requirements
Change-Id: Ifa619b1589942e4a81bd04c47ec8cfb239416a9f
-rw-r--r--requirements.txt6
-rw-r--r--test-requirements.txt4
2 files changed, 5 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt
index 7d65881..db1eab4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,10 +4,10 @@
Babel>=1.3
iso8601>=0.1.9
-netaddr>=0.7.6
-oslo.config>=1.4.0.0a3
+netaddr>=0.7.12
+oslo.config>=1.4.0 # Apache-2.0
pbr>=0.6,!=0.7,<1.0
python-keystoneclient>=0.10.0
-requests>=1.2.1
+requests>=1.2.1,!=2.4.0
six>=1.7.0
WebOb>=1.2.3
diff --git a/test-requirements.txt b/test-requirements.txt
index a13ef95..da84a5f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,8 +9,8 @@ hacking>=0.8.0,<0.9
httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
mock>=1.0
pycrypto>=2.6
-oslosphinx>=2.2.0.0a2
-oslotest>=1.1.0.0a2
+oslosphinx>=2.2.0 # Apache-2.0
+oslotest>=1.1.0 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,<1.3
testrepository>=0.0.18
testresources>=0.2.4