Merge branch 'rename-to-kube' of https://github.com/eparis/kubernetes into eparis-rename-to-kube

Browse Source

* '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

parent 5fc485f0bc a99c3c7963

commit 66d287f7e4

53 changed files with 235 additions and 235 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

plugin/cmd/scheduler/scheduler.go → plugin/cmd/kube-scheduler/scheduler.go