-
k8s-merge-robot authored
Automatic merge from submit-queue Update Docker version after cockpit installation Fixes https://github.com/kubernetes/kubernetes/issues/24530 The vagrant setup didn't worked for me because `cockpit cockpit-kubernetes` brings their own Docker version (1.7) which doesn't work and the master components doesn't come up. More information about this bug are in my [issue](https://github.com/kubernetes/kubernetes/issues/24530). My test system: ```bash $ uname -a Darwin MyMacBook.local 15.4.0 Darwin Kernel Version 15.4.0: Fri Feb 26 22:08:05 PST 2016; root:xnu-3248.40.184~3/RELEASE_X86_64 x86_64 $ vagrant --version Vagrant 1.8.1 $ VBoxManage --version 5.0.16r105871 ```
537dedf6