Closed 04kash closed 5 months ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: nickboldt
The full list of commands accepted by this bot can be found here.
The pull request process is described here
New changes are detected. LGTM label has been removed.
Issues
0 New issues
0 Accepted issues
Measures
0 Security Hotspots
No data about Coverage
No data about Duplication
/cherry-pick 1.2.x
@nickboldt: once the present PR merges, I will cherry-pick it on top of 1.2.x in a new PR and assign it to you.
@nickboldt: #387 failed to apply on top of branch "1.2.x":
Applying: fixed telemetry url
.git/rebase-apply/patch:17: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M .rhdh/bundle/manifests/rhdh-operator.csv.yaml
Falling back to patching base and 3-way merge...
Auto-merging .rhdh/bundle/manifests/rhdh-operator.csv.yaml
CONFLICT (content): Merge conflict in .rhdh/bundle/manifests/rhdh-operator.csv.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fixed telemetry url
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Description
Which issue(s) does this PR fix or relate to
PR acceptance criteria
rhdh-operator.csv.yaml
file accordinglyHow to test changes / Special notes to the reviewer