Merge pull request #11368 from jsafrane/pick-missing-plugin-event

Merged by openshift-bot
openshift · Oct 19, 2016 · 3bc0437 · 3bc0437
2 parents 852f1fe + 487432f
commit 3bc0437
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 2 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/framework_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/framework_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/provision_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/provision_test.go