merging devel

This commit is contained in:
Wayne Witzel III
2016-10-03 10:35:50 -04:00
110 changed files with 5192 additions and 2396 deletions

View File

@@ -4,6 +4,7 @@ anyjson==0.3.3
appdirs==1.4.0
azure==2.0.0rc2
Babel==2.2.0
baron==0.6.2
billiard==3.3.0.16
boto==2.40.0
celery==3.1.23
@@ -12,7 +13,7 @@ cliff==1.15.0
cmd2==0.6.8
d2to1==0.2.11 # TODO: Still needed?
defusedxml==0.4.1
Django==1.8.10
Django==1.8.15
debtcollector==1.2.0
decorator==4.0.6
django-auth-ldap==1.2.6
@@ -114,9 +115,11 @@ rackspace-auth-openstack==1.3
rackspace-novaclient==1.5
rax-default-network-flags-python-novaclient-ext==0.3.2
rax-scheduled-images-python-novaclient-ext==0.3.1
redbaron==0.6.1
requests-oauthlib==0.5.0
requests==2.9.1
requestsexceptions==1.1.1
rply==0.7.4
shade==1.4.0
simplejson==3.8.1
six==1.9.0