From d3adde6b973086dab7da0fc87b2980f821b40224 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 18 Jun 2014 16:11:34 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index 4095c8454..dcbdaf9f8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
-oslo.config>=1.2.0
+oslo.config>=1.2.1
 stevedore>=0.14
 
 # for timeutils
 iso8601>=0.1.9
 
 # for jsonutils
-six>=1.6.0
+six>=1.7.0
 
 # FIXME(markmc): remove this when the drivers no longer
 # import eventlet
diff --git a/test-requirements.txt b/test-requirements.txt
index b7f935fdd..37f3db1f2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -20,5 +20,5 @@ qpid-python
 coverage>=3.6
 
 # this is required for the docs build jobs
-sphinx>=1.2.1,<1.3
+sphinx>=1.1.2,!=1.2.0,<1.3
 oslosphinx