Merge "Block dnspython3 1.14.0"

This commit is contained in:
Jenkins 2016-09-28 17:12:49 +00:00 committed by Gerrit Code Review
commit 180d76e4e1
2 changed files with 4 additions and 4 deletions

@ -35,8 +35,8 @@ django_compressor>=2.0 # MIT
django-floppyforms>=1,<2 # BSD
django-formtools # BSD
django_openstack_auth>=2.4.0 # Apache-2.0
dnspython>=1.14.0 # http://www.dnspython.org/LICENSE
dnspython3>=1.12.0;python_version>='3.0' # http://www.dnspython.org/LICENSE
dnspython>=1.14.0;python_version=='2.7' # http://www.dnspython.org/LICENSE
dnspython3>=1.12.0,!=1.13.0,!=1.14.0;python_version>='3.0' # http://www.dnspython.org/LICENSE
dogpile.cache>=0.6.2 # BSD
dogtag-pki>=10.3.5.1 # LGPLv3+
elasticsearch>=2.0.0,<=3.0.0 # Apache-2.0

@ -110,8 +110,8 @@ django-formtools===1.0
django-nose===1.4.4
django-openstack-auth===2.4.0
django-pyscss===2.0.2
dnspython===1.14.0
dnspython3===1.14.0;python_version=='3.4' or python_version=='3.5'
dnspython===1.14.0;python_version=='2.7'
dnspython3===1.12.0;python_version=='3.4' or python_version=='3.5'
doc8===0.7.0
docker-py===1.7.2
docutils===0.12