Skip to content

Conversation

@andreasgerstmayr
Copy link
Contributor

Notable changes:

[ENHANCEMENT] tempo-plugin: export all models (including TempoTraceQuerySpec)
[ENHANCEMENT] TraceTable: show scrollbar only if content overflows

Signed-off-by: Andreas Gerstmayr <agerstmayr@redhat.com>
@jgbernalp
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2024
@openshift-ci
Copy link

openshift-ci bot commented Oct 31, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andreasgerstmayr, jgbernalp

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 Oct 31, 2024
@andreasgerstmayr
Copy link
Contributor Author

/cherry-pick release-0.3

@openshift-cherrypick-robot

@andreasgerstmayr: once the present PR merges, I will cherry-pick it on top of release-0.3 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.3

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.

@openshift-ci
Copy link

openshift-ci bot commented Oct 31, 2024

@andreasgerstmayr: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 302345c into openshift:main Oct 31, 2024
4 checks passed
@openshift-cherrypick-robot

@andreasgerstmayr: #74 failed to apply on top of branch "release-0.3":

Applying: Upgrade Perses to v0.49.0-rc.1
Using index info to reconstruct a base tree...
M	web/package-lock.json
M	web/package.json
M	web/src/pages/TracesPage/QueryBrowser.tsx
M	web/src/pages/TracesPage/QueryEditor/QueryEditor.tsx
M	web/src/pages/TracesPage/TraceTable.tsx
Falling back to patching base and 3-way merge...
Auto-merging web/src/pages/TracesPage/TraceTable.tsx
CONFLICT (content): Merge conflict in web/src/pages/TracesPage/TraceTable.tsx
Auto-merging web/src/pages/TracesPage/QueryEditor/QueryEditor.tsx
CONFLICT (content): Merge conflict in web/src/pages/TracesPage/QueryEditor/QueryEditor.tsx
Auto-merging web/src/pages/TracesPage/QueryBrowser.tsx
CONFLICT (content): Merge conflict in web/src/pages/TracesPage/QueryBrowser.tsx
Auto-merging web/package.json
CONFLICT (content): Merge conflict in web/package.json
Auto-merging web/package-lock.json
CONFLICT (content): Merge conflict in web/package-lock.json
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 Upgrade Perses to v0.49.0-rc.1

In response to this:

/cherry-pick release-0.3

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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants