Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OBSDOCS-219 - Child PR - Loki GUI Install. #65234

Merged
merged 1 commit into from Oct 6, 2023
Merged

OBSDOCS-219 - Child PR - Loki GUI Install. #65234

merged 1 commit into from Oct 6, 2023

Conversation

libander
Copy link
Contributor

@libander libander commented Sep 26, 2023 •
edited

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 26, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 26, 2023 •
edited

🤖 Updated build preview is available at:
https://65234--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/26905

@libander
Copy link
Contributor Author

libander commented Oct 5, 2023

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 5, 2023
@lpettyjo lpettyjo added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Oct 6, 2023
@lpettyjo lpettyjo self-requested a review October 6, 2023 13:52
@lpettyjo lpettyjo added this to the Continuous Release milestone Oct 6, 2023
@lpettyjo lpettyjo added ok-to-merge and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR labels Oct 6, 2023
@lpettyjo lpettyjo merged commit a858741 into openshift:main Oct 6, 2023
1 check passed
@lpettyjo
Copy link
Contributor

lpettyjo commented Oct 6, 2023

/cherrypick enterprise-4.14

@lpettyjo
Copy link
Contributor

lpettyjo commented Oct 6, 2023

/cherrypick enterprise-4.13

@lpettyjo
Copy link
Contributor

lpettyjo commented Oct 6, 2023

/cherrypick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@lpettyjo: #65234 failed to apply on top of branch "enterprise-4.14":

Patch is empty.
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:

/cherrypick enterprise-4.14

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/test-infra repository.

@lpettyjo
Copy link
Contributor

lpettyjo commented Oct 6, 2023

/cherrypick enterprise-4.11

@openshift-cherrypick-robot
Copy link

@lpettyjo: new pull request created: #65891

In response to this:

/cherrypick enterprise-4.13

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/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 6, 2023
Merged
@openshift-cherrypick-robot
Copy link

@lpettyjo: new pull request created: #65892

In response to this:

/cherrypick enterprise-4.12

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/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 6, 2023
Merged
@openshift-cherrypick-robot
Copy link

@lpettyjo: #65234 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-219 - Child PR - Loki GUI Install.
Using index info to reconstruct a base tree...
M	logging/cluster-logging-loki.adoc
Falling back to patching base and 3-way merge...
Auto-merging logging/cluster-logging-loki.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-loki.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-219 - Child PR - Loki GUI Install.
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:

/cherrypick enterprise-4.11

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/test-infra repository.

@libander libander mentioned this pull request Oct 12, 2023
Merged
@libander
Copy link
Contributor Author

@lpettyjo - manual CP opened.

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

@abrennan89 abrennan89 abrennan89 left review comments

@lpettyjo lpettyjo Awaiting requested review from lpettyjo

Assignees
No one assigned
Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 ok-to-merge size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@libander @ocpdocs-previewbot @lpettyjo @openshift-cherrypick-robot @abrennan89