Updated from global requirements

Change-Id: Ie32b6c2b2bdb3cc23f4d41e1e2df3d7664d19b48

requirements.txt

@@ -1,12 +1,12 @@
 # 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>=1.6
+pbr>=1.6 # Apache-2.0
 cliff>=1.15.0 # Apache-2.0
-iso8601>=0.1.9
+iso8601>=0.1.9 # MIT
-netaddr!=0.7.16,>=0.7.12
+netaddr!=0.7.16,>=0.7.12 # BSD
-requests!=2.9.0,>=2.8.1
+requests!=2.9.0,>=2.8.1 # Apache-2.0
-python-keystoneclient!=1.8.0,>=1.6.0
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
-simplejson>=2.2.0
+simplejson>=2.2.0 # MIT
-six>=1.9.0
+six>=1.9.0 # MIT
-Babel>=1.3
+Babel>=1.3 # BSD

test-requirements.txt

@@ -2,15 +2,15 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.2
-cliff-tablib>=1.0
+cliff-tablib>=1.0 # Apache-2.0
-coverage>=3.6
+coverage>=3.6 # Apache-2.0
-discover
+discover # BSD
-fixtures>=1.3.1
+fixtures>=1.3.1 # Apache-2.0/BSD
-mox>=0.5.3
+mox>=0.5.3 # Apache-2.0
-flake8<=2.4.1,>=2.2.4
+flake8<=2.4.1,>=2.2.4 # MIT
-pep8==1.5.7
+pep8==1.5.7 # MIT
-pyflakes==0.8.1
+pyflakes==0.8.1 # MIT
-python-subunit>=0.0.18
+python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
-testrepository>=0.0.18
+testrepository>=0.0.18 # Apache-2.0/BSD
-testtools>=1.4.0
+testtools>=1.4.0 # MIT