Skip to content

Conversation

@zhuje
Copy link
Contributor

@zhuje zhuje commented Jun 21, 2024

  • Update description of the tracing page when there is no Tempo Stack selected
  • Add/standardize i18n files to mimic troubleshooting-panel-console-plugin

…ugin

- Update description of the tracing page when there is no tempostack selected

Signed-off-by: Jenny Zhu <jenny.a.zhu@gmail.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 21, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 21, 2024

@zhuje: This pull request references OU-452 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

In response to this:

  • Update description of the tracing page when there is no Tempo Stack selected
  • Add/standardize i18n files to mimic troubleshooting-panel-console-plugin

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 jgbernalp and kyoto June 21, 2024 00:30
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 21, 2024
@openshift-ci
Copy link

openshift-ci bot commented Jun 21, 2024

@zhuje: 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.

@jgbernalp
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Jun 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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-merge-bot openshift-merge-bot bot merged commit 2f91c5a into openshift:main Jun 21, 2024
@zhuje
Copy link
Contributor Author

zhuje commented Jun 24, 2024

/cherry-pick release-0.1

@openshift-cherrypick-robot

@zhuje: #18 failed to apply on top of branch "release-0.1":

Applying: - Add/standarize i18n files to minic troubleshooting-panel-console-plugin - Update description of the tracing page when there is no tempostack selected
.git/rebase-apply/patch:248: trailing whitespace.
    "i18next-parser": "^8.13.0", 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	web/src/components/TracingPage.tsx
Falling back to patching base and 3-way merge...
Auto-merging web/src/components/TracingPage.tsx
CONFLICT (content): Merge conflict in web/src/components/TracingPage.tsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 - Add/standarize i18n files to minic troubleshooting-panel-console-plugin - Update description of the tracing page when there is no tempostack selected
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".

In response to this:

/cherry-pick release-0.1

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants