Merge branch 'master' into patch-1

2016-10-28 11:01:28 +01:00
parent 33cdc55903 de27c5c194
commit 1c7a004312
87 changed files with 1242 additions and 303 deletions
@@ -138,7 +138,6 @@ Use the built-in Docker daemon with:
 eval $(minikube docker-env)
 ```
 This command sets up the Docker environment variables so a Docker client can communicate with the minikube Docker daemon.
-Minikube currently supports only docker version 1.11.1 on the server, which is what is supported by Kubernetes 1.3. With a newer docker version, you'll get this [issue](https://github.com/kubernetes/minikube/issues/338).

 ```shell
 docker ps