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

RHDEVDOCS-4897 - Logging 5.7.0 Release Notes #59561

Merged
merged 1 commit into from May 10, 2023
Merged

RHDEVDOCS-4897 - Logging 5.7.0 Release Notes #59561

merged 1 commit into from May 10, 2023

Conversation

libander
Copy link
Contributor

@libander libander commented May 4, 2023 •
edited

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

ocpdocs-previewbot commented May 4, 2023 •
edited

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

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

@libander libander force-pushed the RHDEVDOCS-4897 branch 2 times, most recently from 39cba94 to 3a6aed4 Compare May 10, 2023 08:10
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 10, 2023
periklis
periklis approved these changes May 10, 2023
View reviewed changes
Copy link

@periklis periklis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

anpingli
anpingli reviewed May 10, 2023
View reviewed changes
Copy link

@anpingli anpingli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 10, 2023
@openshift-ci
Copy link

openshift-ci bot commented May 10, 2023

New changes are detected. LGTM label has been removed.

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2023
@rolfedh rolfedh merged commit 613185b into openshift:main May 10, 2023
1 check passed
@rolfedh
Copy link
Contributor

rolfedh commented May 10, 2023

/cherrypick enterprise-4.11

@rolfedh
Copy link
Contributor

rolfedh commented May 10, 2023

/cherrypick enterprise-4.12

@rolfedh
Copy link
Contributor

rolfedh commented May 10, 2023

/cherrypick enterprise-4.13

@openshift-cherrypick-robot
Copy link

@rolfedh: #59561 failed to apply on top of branch "enterprise-4.11":

Applying: RHDEVDOCS-4897 - Logging 5.7.0 Release Notes.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	logging/cluster-logging-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging logging/cluster-logging-release-notes.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 RHDEVDOCS-4897 - Logging 5.7.0 Release Notes.
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.

rolfedh
rolfedh reviewed May 10, 2023
View reviewed changes
Copy link
Contributor

@rolfedh rolfedh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-cherrypick-robot
Copy link

@rolfedh: #59561 failed to apply on top of branch "enterprise-4.12":

Applying: RHDEVDOCS-4897 - Logging 5.7.0 Release Notes.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	logging/cluster-logging-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging logging/cluster-logging-release-notes.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 RHDEVDOCS-4897 - Logging 5.7.0 Release Notes.
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.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
Copy link

@rolfedh: new pull request created: #59865

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 May 10, 2023
Merged
@rolfedh rolfedh added peer-review-done Signifies that the peer review team has reviewed this PR dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs qe-approved Signifies that QE has signed off on this PR branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 labels May 10, 2023
This was referenced May 10, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rolfedh rolfedh rolfedh left review comments

@anpingli anpingli anpingli left review comments

@Dhruv-Soni11 Dhruv-Soni11 Dhruv-Soni11 left review comments

@periklis periklis periklis approved these changes

Assignees

@anpingli anpingli

Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs peer-review-done Signifies that the peer review team has reviewed this PR qe-approved Signifies that QE has signed off on this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@libander @ocpdocs-previewbot @rolfedh @openshift-cherrypick-robot @periklis @anpingli @Dhruv-Soni11 @openshift-merge-robot