Merge pull request #17386 from soltysh/template_cp_from_rebase

Automatic merge from submit-queue. interesting: fixup template data types @liggitt @mfojtik the cherry-pick from #17115
openshift · Nov 20, 2017 · 60412ad · 60412ad
2 parents 98f8714 + f982456
commit 60412ad
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/examples/jenkins/pipeline/bluegreen-pipeline.yaml b/examples/jenkins/pipeline/bluegreen-pipeline.yaml
@@ -103,11 +103,11 @@ objects:
   spec:
     alternateBackends:
     - name: ${NAME}-green
-      weight: "0"
+      weight: 0
     to:
       kind: Service
       name: ${NAME}-blue
-      weight: "100"
+      weight: 100
 - apiVersion: v1
   kind: ImageStream
   metadata:

diff --git a/examples/jenkins/pipeline/maven-pipeline.yaml b/examples/jenkins/pipeline/maven-pipeline.yaml
@@ -148,7 +148,7 @@ objects:
           kind: ImageStreamTag
           name: wildfly:latest
       type: Docker
-    triggers: {}
+    triggers: []
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:

diff --git a/pkg/oc/bootstrap/bindata.go b/pkg/oc/bootstrap/bindata.go
diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go