Merge pull request #12876 from derekwaynecarr/pick-41147

Merged by openshift-bot
openshift · Feb 10, 2017 · d30d185 · d30d185
2 parents 898266a + 68d6075
commit d30d185
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/helpers.go b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/helpers.go