Merge pull request #2294 from smarterclayton/embed_kube_binaries

Merged by openshift-bot
openshift · May 16, 2015 · d7ea592 · d7ea592
2 parents ede4258 + 20b1160
commit d7ea592
Show file tree

Hide file tree

Showing 776 changed files with 78,467 additions and 31 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/...workspace/src/github.com/GoogleCloudPlatform/kubernetes/cmd/kube-apiserver/app/plugins.go b/...workspace/src/github.com/GoogleCloudPlatform/kubernetes/cmd/kube-apiserver/app/plugins.go