From 18d77299c68a646f38187ce0ebb5540ec70f25ad Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 16 May 2016 16:45:54 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I09512326aaaee909ce1a204a23ae948f4f2a45d9
---
 setup.py              |  2 ++
 test-requirements.txt | 16 +++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 47aa908..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,8 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 # In python < 2.7.4, a lazy loading of package `pbr` will break
diff --git a/test-requirements.txt b/test-requirements.txt
index 101393b..3b06063 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,12 +1,14 @@
 # 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.
 # of appearance.
 
 hacking<0.11,>=0.10.0
-flake8-docstrings==0.2.1.post1
+flake8-docstrings==0.2.1.post1 # MIT
 
-coverage>=3.6
-fixtures>=1.3.1
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-testrepository>=0.0.18
-testresources>=0.2.4
-testtools>=1.4.0
\ No newline at end of file
+coverage>=3.6 # Apache-2.0
+fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testresources>=0.2.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT