Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-09-29 12:02:11 +00:00 committed by Gerrit Code Review
commit d3c4d7d94d
2 changed files with 3 additions and 4 deletions

View File

@ -5,8 +5,7 @@
pbr>=1.6 # Apache-2.0
Babel>=2.3.4 # BSD
kazoo>=2.2 # Apache-2.0
ovs>=2.5.0;python_version=='2.7' # Apache-2.0
ovs>=2.6.0.dev3;python_version>='3.4' # Apache-2.0
ovs>=2.6.0 # Apache-2.0
pyzmq>=14.3.1 # LGPL+BSD
ryu!=4.1,!=4.2,!=4.2.1,!=4.4,>=3.30 # Apache-2.0
SQLAlchemy<1.1.0,>=1.0.10 # MIT

View File

@ -8,8 +8,8 @@ hacking<0.12,>=0.11.0 # Apache-2.0
coverage>=3.6 # Apache-2.0
python-pytun>=2.2.1 # MIT
python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
oslosphinx>=4.7.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testresources>=0.2.4 # Apache-2.0/BSD