Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-12-13 11:14:17 +00:00 committed by Gerrit Code Review
commit 3b424826ea
2 changed files with 3 additions and 3 deletions

View File

@ -2,6 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=1.6 # Apache-2.0 pbr>=1.8 # Apache-2.0
Babel>=2.3.4 # BSD Babel>=2.3.4 # BSD
-e git://git.openstack.org/openstack/neutron.git@master#egg=neutron -e git://git.openstack.org/openstack/neutron.git@master#egg=neutron

View File

@ -4,11 +4,11 @@
hacking<0.11,>=0.10.0 hacking<0.11,>=0.10.0
coverage>=3.6 # Apache-2.0 coverage>=4.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
psycopg2>=2.5 # LGPL/ZPL psycopg2>=2.5 # LGPL/ZPL
PyMySQL!=0.7.7,>=0.6.2 # MIT License PyMySQL!=0.7.7,>=0.7.6 # MIT License
oslosphinx>=4.7.0 # Apache-2.0 oslosphinx>=4.7.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
os-testr>=0.8.0 # Apache-2.0 os-testr>=0.8.0 # Apache-2.0