Merge branch 'rename-to-kube' of https://github.com/eparis/kubernetes into eparis-rename-to-kube
* 'rename-to-kube' of https://github.com/eparis/kubernetes: rename kube server binaries to kube- Conflicts: docs/salt.md
This commit is contained in:
Reference in New Issue
Block a user