Updated from global requirements

Change-Id: I14ec93eaa97fc52b39e00175adcd718dfc4579b4

2 files changed, 11 insertions, 5 deletions

diff --git a/requirements.txt b/requirements.txt
index 129f4dcc..ac66953f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,6 @@
+# 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.
 pbr>=0.6,!=0.7,<1.0
 SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
 eventlet>=0.15.1
@@ -7,14 +10,14 @@ Routes>=1.12.3,!=2.0
 WebOb>=1.2.3
 PasteDeploy>=1.5.0
 Paste
-sqlalchemy-migrate>=0.9.1
+sqlalchemy-migrate>=0.9.1,!=0.9.2
 netaddr>=0.7.12
 netifaces>=0.10.4
 httplib2>=0.7.5
 lxml>=2.3
 passlib
 python-heatclient>=0.2.9
-python-novaclient>=2.17.0
+python-novaclient>=2.18.0
 python-cinderclient>=1.0.7
 python-keystoneclient>=0.10.0
 python-swiftclient>=2.2.0
@@ -24,8 +27,8 @@ iso8601>=0.1.9
 jsonschema>=2.0.0,<3.0.0
 Jinja2
 pexpect>=3.1 # ISC License
-oslo.config>=1.4.0.0a3
+oslo.config>=1.4.0  # Apache-2.0
 MySQL-python
 Babel>=1.3
 six>=1.7.0
-stevedore>=0.14
+stevedore>=1.0.0  # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 5c179163..bdb14c85 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,10 @@
+# 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.
 # Hacking already pins down pep8, pyflakes and flake8
 hacking>=0.8.0,<0.9
 sphinx>=1.1.2,!=1.2.0,<1.3
-oslosphinx>=2.2.0.0a2
+oslosphinx>=2.2.0  # Apache-2.0
 
 coverage>=3.6
 nose