Merge pull request #3467 from mboersma/update-docker-py

chore(controller): update docker-py to 1.1.0

Author: mboersma

controller/requirements.txt

@@ -11,7 +11,7 @@ django-guardian==1.2.5
 django-json-field==0.5.7
 django-auth-ldap==1.2.5
 djangorestframework==3.0.5
-docker-py==0.7.2
+docker-py==1.1.0
 gunicorn==19.3.0
 paramiko==1.15.2
 psycopg2==2.6

docs/docs_requirements.txt

@@ -15,7 +15,7 @@ django-guardian==1.2.5
 django-json-field==0.5.7
 django-auth-ldap==1.2.5
 djangorestframework==3.0.5
-docker-py==0.7.2
+docker-py==1.1.0
 gunicorn==19.3.0
 paramiko==1.15.2
 python-etcd==0.3.2