Merge pull request #16392 from jim-minter/upstream51796

Automatic merge from submit-queue (batch tested with PRs 16534, 16533, 16510, 16508, 16392) UPSTREAM: 51796: Fix pod and node names switched around in error message.
openshift · Sep 25, 2017 · a28f8a4 · a28f8a4
2 parents 64579ce + e6b312f
commit a28f8a4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go