Merge remote-tracking branch 'remotes/origin/develop' into epic-summary_reformat

bc438514 · Peter van 't Hof · 1603c57d · 495fbe1b · bc438514
Commit bc438514 authored Mar 02, 2017 by Peter van 't Hof
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Jenkinsfile Jenkinsfile +3 -3

No files found.
--- a/Jenkinsfile
+++ b/Jenkinsfile
-timeout(45) {
-    node('local') {
+node('local') {
+    timeout(45) {
        try {

            stage('Init') {
@@ -42,4 +42,4 @@ timeout(45) {
            throw e
        }
    }
-}
\ No newline at end of file
+}