From 2da929dd1f4a29b2cbc961a31e7160ec17a2e07c Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 4 Jul 2016 17:21:52 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I095534fe187d9f6581b1fba87209daf2170cc795
---
 requirements.txt      | 14 +++++++-------
 test-requirements.txt |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ac08542d..29b023ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,23 +1,23 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-astroid<1.4.0 # LGPL # breaks pylint 1.4.4
-setuptools>=16.0 # PSF/ZPL
+astroid<1.4.0 # LGPLv2.1 # breaks pylint 1.4.4
+setuptools!=24.0.0,>=16.0 # PSF/ZPL
 pbr>=1.6 # Apache-2.0
 python-swiftclient>=2.2.0 # Apache-2.0
-python-cinderclient>=1.6.0 # Apache-2.0
+python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
 python-glanceclient>=2.0.0 # Apache-2.0
 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
 python-openstackclient>=2.1.0 # Apache-2.0
-oslo.utils>=3.5.0 # Apache-2.0
+oslo.utils>=3.14.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
 oslo.log>=1.14.0 # Apache-2.0
-oslo.config>=3.9.0 # Apache-2.0
-keystoneauth1>=2.1.0  # Apache-2.0
+oslo.config>=3.10.0 # Apache-2.0
+keystoneauth1>=2.7.0 # Apache-2.0
 
 PyMySQL>=0.6.2 # MIT License
 pymongo!=3.1,>=3.0.2 # Apache-2.0
-paramiko>=1.16.0 # LGPL
+paramiko>=2.0 # LGPLv2.1+
 six>=1.9.0 # MIT
 
 # Not in global-requirements
diff --git a/test-requirements.txt b/test-requirements.txt
index a91553ff..fa93eec6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,10 +5,10 @@ flake8<2.6.0,>=2.5.4 # MIT
 hacking<0.11,>=0.10.2
 coverage>=3.6 # Apache-2.0
 discover # BSD
-mock>=1.2 # BSD
-pylint==1.4.5 # GNU GPL v2
+mock>=2.0 # BSD
+pylint==1.4.5 # GPLv2
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT