Kubernetes Submit Queue 9385d50100 Merge pull request #47345 from luxas/kubeadm_move_controlplane_phase ... Automatic merge from submit-queue (batch tested with PRs 46928, 47345) kubeadm: Move directory ./master to ./phases/controlplane **What this PR does / why we need it**: - Moves app/master into phases/controlplane. It should be in the phases directory, was just overlooked earlier - Harmonizes the import names in phases/controlplane with the similar import names in cmd/kubeadm **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: Please review only second and third commit, based on https://github.com/kubernetes/kubernetes/pull/47339 Targets v1.8 **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews @timothysc @pipejakob		2017-07-04 04:37:31 -07:00
..
app	Merge pull request #47345 from luxas/kubeadm_move_controlplane_phase	2017-07-04 04:37:31 -07:00
test/cmd	add validate to not allow mix --config with other arguments	2017-05-31 13:41:21 +08:00
BUILD	Convert go_binary linkstamp to x_defs	2017-06-08 14:59:55 -07:00
OWNERS	Add timothysc to kubeadm reviewers	2017-06-13 09:07:39 -05:00
kubeadm.go	Refactor the whole binary, a lot of changes in one commit I know, but I just hacked on this and modified everything I thought was messy or could be done better.	2016-12-09 12:48:12 +02:00