Skip to content

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #108

/assign andreasgerstmayr

/cherrypick release-0.4

Signed-off-by: Andreas Gerstmayr <agerstmayr@redhat.com>
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 15, 2025

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: OU-805

In response to this:

This is an automated cherry-pick of #108

/assign andreasgerstmayr

/cherrypick release-0.4

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from IshwarKanse and jgbernalp May 15, 2025 15:40
@andreasgerstmayr
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 15, 2025
@openshift-ci
Copy link

openshift-ci bot commented May 15, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andreasgerstmayr, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 15, 2025
@andreasgerstmayr
Copy link
Contributor

/label ux-approved
no ux changes
/label qe-approved
qe will be done post merge

@openshift-ci openshift-ci bot added ux-approved Signifies that UX has signed off on this PR qe-approved Signifies that QE has signed off on this PR labels May 16, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 16, 2025

@openshift-cherrypick-robot: This pull request references OU-805 which is a valid jira issue.

In response to this:

This is an automated cherry-pick of #108

/assign andreasgerstmayr

/cherrypick release-0.4

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 16, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 4db2c44 into openshift:release-1.0 May 16, 2025
1 check passed
@openshift-cherrypick-robot
Copy link
Author

@openshift-cherrypick-robot: #112 failed to apply on top of branch "release-0.4":

Applying: OU-805: account for selected time range when showing attribute values
Using index info to reconstruct a base tree...
A	web/src/hooks/useTagValues.ts
A	web/src/pages/TracesPage/Toolbar/AttributeFilters.tsx
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): web/src/pages/TracesPage/Toolbar/AttributeFilters.tsx deleted in HEAD and modified in OU-805: account for selected time range when showing attribute values. Version OU-805: account for selected time range when showing attribute values of web/src/pages/TracesPage/Toolbar/AttributeFilters.tsx left in tree.
CONFLICT (modify/delete): web/src/hooks/useTagValues.ts deleted in HEAD and modified in OU-805: account for selected time range when showing attribute values. Version OU-805: account for selected time range when showing attribute values of web/src/hooks/useTagValues.ts left in tree.
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 OU-805: account for selected time range when showing attribute values

In response to this:

This is an automated cherry-pick of #108

/assign andreasgerstmayr

/cherrypick release-0.4

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.

@andreasgerstmayr
Copy link
Contributor

/cherrypick release-0.4

@openshift-cherrypick-robot
Copy link
Author

@andreasgerstmayr: new pull request created: #119

In response to this:

/cherrypick release-0.4

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

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR ux-approved Signifies that UX has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants