From 0c3683af12d36dded5cb0a4663e907193a8eea16 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 22 Oct 2014 00:43:19 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I6e40b913ce0687e260c13e3cf2acb700a684fffe
---
 requirements.txt      | 6 +++---
 test-requirements.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index de79c044d..0840aa374 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,10 +7,10 @@ pbr>=0.6,!=0.7,<1.0
 
 argparse
 iso8601>=0.1.9
-keyring>=2.1
+keyring>=2.1,!=3.3
 PrettyTable>=0.7,<0.8
 pycrypto>=2.6
-requests>=1.1
-simplejson>=2.0.9
+requests>=2.2.0,!=2.4.0
+simplejson>=2.2.0
 Babel>=1.3
 six>=1.7.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 85045051b..f24f0469b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,6 +11,6 @@ fixtures>=0.3.14
 mock>=1.0
 ordereddict
 oslosphinx>=2.2.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,<1.3
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 testrepository>=0.0.18
 testtools>=0.9.34