Merge branch 'master' into persist-https-enforcement

Author: mattk42

README.md

@@ -84,7 +84,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
 
-[install-k8s]: http://kubernetes.io/gettingstarted/
+[install-k8s]: https://kubernetes.io/docs/setup/pick-right-solution
 [issues]: https://github.com/deis/controller/issues
 [prs]: https://github.com/deis/controller/pulls
 [workflow]: https://github.com/deis/workflow

rootfs/requirements.txt

@@ -1,22 +1,22 @@
 # Deis controller requirements
-backoff==1.4.2
-Django==1.11.1
+backoff==1.4.3
+Django==1.11.2
 django-auth-ldap==1.2.12
 django-cors-middleware==1.3.1
 django-guardian==1.4.8
 djangorestframework==3.6.3
 docker-py==1.10.6
 gunicorn==19.7.1
 idna==2.5
-jmespath==0.9.2
+jmespath==0.9.3
 jsonfield==2.0.1
 jsonschema==2.6.0
 morph==0.1.2
 ndg-httpsclient==0.4.2
 packaging==16.8
 pyasn1==0.2.3
 psycopg2==2.7.1
-pyldap==2.4.35
+pyldap==2.4.35.1
 pyOpenSSL==17.0.0
 pytz==2017.2
 requests==2.14.2