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:
Joe Beda
2014-11-17 09:52:10 -08:00
53 changed files with 235 additions and 235 deletions

View File

@@ -20,11 +20,11 @@ readonly KUBE_GOPATH="${KUBE_OUTPUT}/go"
# The set of server targets that we are only building for Linux
readonly KUBE_SERVER_TARGETS=(
cmd/proxy
cmd/apiserver
cmd/controller-manager
cmd/kube-proxy
cmd/kube-apiserver
cmd/kube-controller-manager
cmd/kubelet
plugin/cmd/scheduler
plugin/cmd/kube-scheduler
)
readonly KUBE_SERVER_BINARIES=("${KUBE_SERVER_TARGETS[@]##*/}")