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

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

diff --git a/requirements.txt b/requirements.txt
index 0f5366425..d1159c201 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,8 @@ argparse
 Babel>=1.3
 iso8601>=0.1.9
 netaddr>=0.7.6
-oslo.config>=1.2.0
+oslo.config>=1.2.1
 pbr>=0.6,!=0.7,<1.0
 PrettyTable>=0.7,<0.8
 requests>=1.1
-six>=1.6.0
+six>=1.7.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 2528b17bb..fa1f0e6c8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ mock>=1.0
 mox3>=0.7.0
 oauthlib>=0.6
 pycrypto>=2.6
-sphinx>=1.1.2,<1.2
+sphinx>=1.1.2,!=1.2.0,<1.3
 stevedore>=0.14
 testrepository>=0.0.18
 testresources>=0.2.4