Files
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
..
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00
2017-01-01 23:11:09 -08:00
2016-12-29 13:04:10 -08:00
2016-12-29 13:04:10 -08:00