Skip to content

[release-v1.17] reorder results#622

Merged
ppitonak merged 1 commit intoopenshift-pipelines:release-v1.17from
srivickynesh:logging-reorder
Apr 24, 2025
Merged

[release-v1.17] reorder results#622
ppitonak merged 1 commit intoopenshift-pipelines:release-v1.17from
srivickynesh:logging-reorder

Conversation

@srivickynesh
Copy link
Collaborator

No description provided.

Signed-off-by: Sri Vignesh <sselvan@redhat.com>
@ppitonak ppitonak merged commit 0de4f27 into openshift-pipelines:release-v1.17 Apr 24, 2025
3 checks passed
@srivickynesh
Copy link
Collaborator Author

/cherrypick release-v1.16

@openshift-cherrypick-robot

@srivickynesh: #622 failed to apply on top of branch "release-v1.16":

Applying: reorder results
Using index info to reconstruct a base tree...
M	specs/olm.spec
Falling back to patching base and 3-way merge...
Auto-merging specs/olm.spec
CONFLICT (content): Merge conflict in specs/olm.spec
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 reorder results

Details

In response to this:

/cherrypick release-v1.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants