Merge pull request #18919 from spxtr/timeout-jobs

Auto commit by PR queue bot

Merge pull request #18919 from spxtr/timeout-jobs
d71f9a17 · k8s-merge-robot · b7dd32ad · 58decdb2 · d71f9a17
Commit d71f9a17 authored Dec 19, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

kubernetes-e2e.yaml hack/jenkins/job-configs/kubernetes-e2e.yaml +0 -1

No files found.
--- a/hack/jenkins/job-configs/kubernetes-e2e.yaml
+++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml
@@ -25,7 +25,6 @@
            colormap: xterm
        - timeout:
            timeout: '{timeout}'
-            abort: true
            fail: true
        - timestamps
        - workspace-cleanup