Merge pull request #11714 from soltysh/issue11661

Merged by openshift-bot
openshift · Nov 2, 2016 · 6932bcc · 6932bcc
2 parents 235ed24 + 0d057f1
commit 6932bcc
Showing 1 changed file with 63 additions and 23 deletions.
diff --git a/vendor/k8s.io/kubernetes/test/e2e/disruption.go b/vendor/k8s.io/kubernetes/test/e2e/disruption.go