Merge pull request #14714 from derekwaynecarr/pick-44115

Merged by openshift-bot
openshift · Jun 20, 2017 · 6bc15cb · 6bc15cb
2 parents f2be346 + 6ad7ba2
commit 6bc15cb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/factory/factory.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/factory/factory.go