Merge pull request #17405 from mfojtik/fix-ds-logs

Automatic merge from submit-queue (batch tested with PRs 17405, 17410). UPSTREAM: 56045: Fix getting logs from daemonset @smarterclayton PTAL
openshift · Nov 22, 2017 · d60815f · d60815f
2 parents 6270675 + c3e022a
commit d60815f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util/factory_object_mapping.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util/factory_object_mapping.go