Merge pull request #13084 from pweil-/pick-38855-3.5

Merged by openshift-bot
openshift · Mar 1, 2017 · 8c5ffa2 · 8c5ffa2
2 parents 6131e40 + e479bd9
commit 8c5ffa2
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 4 deletions.
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/pv_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/goroutinemap/goroutinemap.go b/vendor/k8s.io/kubernetes/pkg/util/goroutinemap/goroutinemap.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/goroutinemap/goroutinemap_test.go b/vendor/k8s.io/kubernetes/pkg/util/goroutinemap/goroutinemap_test.go