Skip to content

Commit 60412ad

Browse files
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
2 parents 98f8714 + f982456 commit 60412ad

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

examples/jenkins/pipeline/bluegreen-pipeline.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ objects:
103103
spec:
104104
alternateBackends:
105105
- name: ${NAME}-green
106-
weight: "0"
106+
weight: 0
107107
to:
108108
kind: Service
109109
name: ${NAME}-blue
110-
weight: "100"
110+
weight: 100
111111
- apiVersion: v1
112112
kind: ImageStream
113113
metadata:

examples/jenkins/pipeline/maven-pipeline.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ objects:
148148
kind: ImageStreamTag
149149
name: wildfly:latest
150150
type: Docker
151-
triggers: {}
151+
triggers: []
152152
- apiVersion: v1
153153
kind: DeploymentConfig
154154
metadata:

pkg/oc/bootstrap/bindata.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/extended/testdata/bindata.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)