Skip to content

Commit

Permalink
Merge origin/release-3.6 into local branch, favoring local changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dmaizel committed Dec 9, 2024
2 parents 2c1079c + 2891faa commit d838b5f
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 14 deletions.
10 changes: 7 additions & 3 deletions manifests/quick-start-minimal.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions manifests/quick-start-mysql.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions manifests/quick-start-postgres.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/e2e/testdata/artifact-workflow-stopped.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- metadata:
name: artifacts
spec:
accessModes: [ "ReadWriteOnce" ]
accessModes: ["ReadWriteOnce"]
resources:
requests:
storage: 1Gi
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/artifactgc/artgc-dag-wf-self-delete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
- metadata:
name: artifacts
spec:
accessModes: [ "ReadWriteOnce" ]
accessModes: ["ReadWriteOnce"]
resources:
requests:
storage: 1Gi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
- metadata:
name: artifacts
spec:
accessModes: [ "ReadWriteOnce" ]
accessModes: ["ReadWriteOnce"]
resources:
requests:
storage: 1Gi
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/artifactgc/artgc-dag-wf-stopped.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
- metadata:
name: artifacts
spec:
accessModes: [ "ReadWriteOnce" ]
accessModes: ["ReadWriteOnce"]
resources:
requests:
storage: 1Gi
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/retry-on-stopped.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- name: sleep
container:
image: alpine:latest
command: [ sleep, "10" ]
command: [sleep, "10"]

- name: stop
container:
Expand Down

0 comments on commit d838b5f

Please sign in to comment.