Commit f28eb2e
authored
Merge pull request #18559 from sdodson/release-3.7
Automatic merge from submit-queue.
Pull image stream changes back from ose/enterprise-3.7
We'll sync content from origin/release-3.7 ->
openshift-ansible/release-3.7 going forward4 files changed
Lines changed: 6 additions & 6 deletions
File tree
- examples/image-streams
- pkg/oc/bootstrap
- test/extended/testdata
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
944 | 944 | | |
945 | 945 | | |
946 | 946 | | |
947 | | - | |
| 947 | + | |
948 | 948 | | |
949 | 949 | | |
950 | 950 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
846 | 846 | | |
847 | 847 | | |
848 | 848 | | |
849 | | - | |
| 849 | + | |
850 | 850 | | |
851 | 851 | | |
852 | 852 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments