Merge pull request #12134 from wtrocki/patch-1

OpenShift Bot · web-flow · commit 1b65aa5841ef · 2016-12-09T05:09:51.000-05:00
Merged by openshift-bot
diff --git a/examples/jenkins/jenkins-ephemeral-template.json b/examples/jenkins/jenkins-ephemeral-template.json
@@ -89,7 +89,7 @@
                 },
                 "livenessProbe": {
                     "timeoutSeconds": 3,
-                    "initialDelaySeconds": 120,
+                    "initialDelaySeconds": 420,
                     "failureThreshold" : 30,
                     "httpGet": {
                         "path": "/login",
diff --git a/examples/jenkins/jenkins-persistent-template.json b/examples/jenkins/jenkins-persistent-template.json
@@ -106,7 +106,7 @@
                 },
                 "livenessProbe": {
                     "timeoutSeconds": 3,
-                    "initialDelaySeconds": 120,
+                    "initialDelaySeconds": 420,
                     "failureThreshold" : 30,
                     "httpGet": {
                         "path": "/login",
diff --git a/pkg/bootstrap/bindata.go b/pkg/bootstrap/bindata.go
