Merge pull request #14331 from sjenning/pick-46305

Merged by openshift-bot
openshift · May 26, 2017 · a1dffba · a1dffba
2 parents 827f454 + f55079b
commit a1dffba
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/v1/pod/util.go b/vendor/k8s.io/kubernetes/pkg/api/v1/pod/util.go
diff --git a/vendor/k8s.io/kubernetes/pkg/api/v1/pod/util_test.go b/vendor/k8s.io/kubernetes/pkg/api/v1/pod/util_test.go