Merge pull request #18919 from spxtr/timeout-jobs

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-19 03:43:50 -08:00
commit d71f9a175a

View File

@ -25,7 +25,6 @@
colormap: xterm colormap: xterm
- timeout: - timeout:
timeout: '{timeout}' timeout: '{timeout}'
abort: true
fail: true fail: true
- timestamps - timestamps
- workspace-cleanup - workspace-cleanup