Skip to content

RHDEVDOCS-2740 Restructure the Logging release notes to set the stage for upcoming 5.0.1 release. #30094

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
Merged
Preeticp merged 1 commit into from
Mar 17, 2021
Merged

RHDEVDOCS-2740 Restructure the Logging release notes to set the stage for upcoming 5.0.1 release. #30094

Preeticp merged 1 commit into from
Mar 17, 2021
+244 −227

Conversation

@rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Mar 4, 2021 •
edited
Loading

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 4, 2021
@netlify
Copy link

netlify bot commented Mar 4, 2021 •
edited
Loading

Deploy preview for osdocs ready!

Built with commit 3c96838

https://deploy-preview-30094--osdocs.netlify.app

@rolfedh rolfedh changed the title [WIP]RHDEVDOCS-2740 [WIP]RHDEVDOCS-2740 release notes for Logging 5.1 Mar 9, 2021
@rolfedh rolfedh changed the title [WIP]RHDEVDOCS-2740 release notes for Logging 5.1 [WIP]RHDEVDOCS-2740 release notes for Logging 5.0.1 Mar 16, 2021
rolfedh
rolfedh commented Mar 16, 2021
View reviewed changes
Copy link
Contributor Author

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

@vimalk78 Please hold https://errata.devel.redhat.com/docs/show/70510 until this PR has been published.

modules/cluster-logging-release-notes-5.0.1.adoc Outdated
Copy link
Contributor Author

@rolfedh rolfedh Mar 16, 2021

Choose a reason for hiding this comment

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

@anpingli @vimalk78 @jcantrill @ewolinetz This is the single Jira I have for the 5.0.1 release notes. We should add any other Jiras that require description. Any Jiras that do not require a release note will not be listed here. However, we will list ALL 5.0.1 Jiras in the erratum, https://errata.devel.redhat.com/docs/doc_text_info/70510

Copy link
Contributor Author

@rolfedh rolfedh Mar 16, 2021

Choose a reason for hiding this comment

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

@vikram-redhat This is the content I'm still sorting out with the logging team. When it's ready, I'll create a new PR that updates this file and uncomments the include so it appears in the docs.

Copy link

@vimalk78 vimalk78 Mar 17, 2021

Choose a reason for hiding this comment

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

ok

rolfedh
rolfedh commented Mar 16, 2021
View reviewed changes
modules/cluster-logging-release-notes-5.0.1.adoc Outdated
Copy link
Contributor Author

@rolfedh rolfedh Mar 16, 2021

Choose a reason for hiding this comment

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

@vikram-redhat This is the content I'm still sorting out with the logging team. When it's ready, I'll create a new PR that updates this file and uncomments the include so it appears in the docs.

@vikram-redhat
Copy link
Contributor

vikram-redhat commented Mar 17, 2021

Thanks @rolfedh - lgtm.

@rolfedh rolfedh changed the title [WIP]RHDEVDOCS-2740 release notes for Logging 5.0.1 [WIP]RHDEVDOCS-2740 Restructure the Logging release notes to set the stage for upcoming 5.0.1 release. Mar 17, 2021
@rolfedh rolfedh changed the title [WIP]RHDEVDOCS-2740 Restructure the Logging release notes to set the stage for upcoming 5.0.1 release. RHDEVDOCS-2740 Restructure the Logging release notes to set the stage for upcoming 5.0.1 release. Mar 17, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 17, 2021
Preeticp
Preeticp reviewed Mar 17, 2021
View reviewed changes
Copy link
Contributor

@Preeticp Preeticp left a comment

Choose a reason for hiding this comment

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

Hi, Rolfe, overall looks great. I have left a couple of minor suggestions, PTAL.

@Preeticp Preeticp added this to the Next Release milestone Mar 17, 2021
@Preeticp Preeticp merged commit 0074c0f into openshift:master Mar 17, 2021
@Preeticp
Copy link
Contributor

Preeticp commented Mar 17, 2021

/cherrypick enterprise-4.7

@Preeticp
Copy link
Contributor

Preeticp commented Mar 17, 2021

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 17, 2021

@Preeticp: #30094 failed to apply on top of branch "enterprise-4.7":

Applying: RHDEVDOCS-2740 release notes for Logging 5.0.1 #30094
Using index info to reconstruct a base tree...
M	logging/cluster-logging-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging logging/cluster-logging-release-notes.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-release-notes.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 RHDEVDOCS-2740 release notes for Logging 5.0.1 #30094
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".
Details

In response to this:

/cherrypick enterprise-4.7

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 pushed a commit to openshift-cherrypick-robot/openshift-docs that referenced this pull request Mar 17, 2021
@rolfedh
RHDEVDOCS-2740 release notes for Logging 5.0.1 openshift#30094
6d7dbfa
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 17, 2021
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 17, 2021

@Preeticp: new pull request created: #30581

Details

In response to this:

/cherrypick enterprise-4.8

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 mentioned this pull request Mar 17, 2021
Merged
Preeticp added a commit that referenced this pull request Mar 17, 2021
@Preeticp
Merge pull request #30592 from rolfedh/enterprise-4.7
60a3de9 
Manually CP #30094 to 4.7
@yuvalk yuvalk mentioned this pull request Mar 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Preeticp Preeticp Preeticp left review comments

+2 more reviewers

@vimalk78 vimalk78 vimalk78 left review comments

@vikram-redhat vikram-redhat vikram-redhat left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

branch/enterprise-4.7 branch/enterprise-4.8 size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

6 participants

@rolfedh @vikram-redhat @Preeticp @openshift-cherrypick-robot @vimalk78 @openshift-ci-robot