kubernetes/cmd
Kubernetes Submit Queue 84df067967 Merge pull request #39450 from pipejakob/file-disc
Automatic merge from submit-queue (batch tested with PRs 36229, 39450)

Bugfix on kubeadm join with non-token discovery.

Without this change, using a non-token discovery mechanism during a join triggers a nil pointer panic (instead of an error message about not being implemented yet).

CC @mikedanese 

**Release note**:
```release-note
NONE
```
2017-01-04 17:36:08 -08:00
..
clicheck autogenerated 2016-12-29 13:04:10 -08:00
cloud-controller-manager autogenerated 2016-12-29 13:04:10 -08:00
gendocs autogenerated 2016-12-29 13:04:10 -08:00
genkubedocs autogenerated 2016-12-29 13:04:10 -08:00
genman autogenerated 2016-12-29 13:04:10 -08:00
genslateyaml autogenerated 2016-12-29 13:04:10 -08:00
genswaggertypedocs autogenerated 2016-12-29 13:04:10 -08:00
genutils autogenerated 2016-12-29 13:04:10 -08:00
genyaml autogenerated 2016-12-29 13:04:10 -08:00
hyperkube autogenerated 2016-12-29 13:04:10 -08:00
kube-apiserver refactored admission to avoid internal client references 2017-01-03 15:50:12 -05:00
kube-controller-manager Merge pull request #39399 from zhouhaibing089/namespace-controller 2017-01-04 10:04:00 -08:00
kube-discovery autogenerated 2016-12-29 13:04:10 -08:00
kube-dns autogenerated 2016-12-29 13:04:10 -08:00
kube-proxy autogenerated 2016-12-29 13:04:10 -08:00
kubeadm Bugfix on kubeadm join with non-token discovery. 2017-01-04 15:40:52 -08:00
kubectl autogenerated 2016-12-29 13:04:10 -08:00
kubelet Remove the deprecated --reconcile-cidr flag from kubelet 2016-12-30 18:26:53 +02:00
kubemark autogenerated 2016-12-29 13:04:10 -08:00
kubernetes-discovery mechanical changes for move 2017-01-04 10:27:05 -05:00
libs/go2idl Update generated for 2017 2017-01-01 23:11:09 -08:00
linkcheck autogenerated 2016-12-29 13:04:10 -08:00
mungedocs fix mungedocs unit tests 2016-12-29 13:04:10 -08:00
OWNERS Remove myself from a bunch of OWNERS files, as I am too overloaded 2016-05-11 13:34:51 -07:00