Skip to content

Conversation

@lbscorpio
Copy link
Contributor

@lbscorpio lbscorpio commented May 22, 2021

@vikram-redhat There is one minor issue on logging release notes, minimum version that the change applies to should be 4.7 in my opinion, could you arrange someone to review them? Thanks.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 22, 2021
@netlify
Copy link

netlify bot commented May 22, 2021

Deploy Preview for osdocs ready!

Built with commit 5733e4e

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

@lbscorpio lbscorpio changed the title Add Bug fix prefix on the logging release notes [enterprise-4.7] Add Bug fix prefix on the logging release notes May 22, 2021
@vikram-redhat vikram-redhat requested review from Preeticp and rolfedh May 22, 2021 08:23
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-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 24, 2021
@lbscorpio
Copy link
Contributor Author

@Preeticp Any update? Thanks.

@rolfedh
Copy link
Contributor

rolfedh commented Jun 30, 2021

Hi, @lbscorpio. I've asked for someone to merge this PR. Thanks.

@JStickler JStickler merged commit 3c0fd04 into openshift:master Jun 30, 2021
@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.7

@JStickler
Copy link
Contributor

@lbscorpio If this also needs to be in the 4.8 branch, ping me and I'll cherry pick to 4.8 as well.

@openshift-cherrypick-robot

@JStickler: new pull request created: #34154

Details

In response to this:

/cherry-pick 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.

@lbscorpio
Copy link
Contributor Author

@JStickler Yes, it should cherry pick to 4.8 too, thanks.

@rolfedh
Copy link
Contributor

rolfedh commented Jul 12, 2021

@JStickler Yes, it should cherry pick to 4.8 too, thanks.

@JStickler There's no need to CP this to 4.8. I already have these changes in my work on the 5.1 Release Notes. I'd rather not have to perform a rebase.

@JStickler
Copy link
Contributor

@rolfedh as long as the files get into 4.8, I don't care how they get there, Thanks for the info.

@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.8

@openshift-cherrypick-robot

@JStickler: #32725 failed to apply on top of branch "enterprise-4.8":

Applying: Add Bug fix prefix on the logging release notes
Using index info to reconstruct a base tree...
M	modules/cluster-logging-release-notes-5.0.0.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-release-notes-5.0.0.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-release-notes-5.0.0.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 Add Bug fix prefix on the logging 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".

Details

In response to this:

/cherry-pick 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.

@JStickler
Copy link
Contributor

D'oh, I forgot that Rolf had this covered. Not going to worry about the failed CP then.

@rolfedh
Copy link
Contributor

rolfedh commented Jul 19, 2021

@JStickler. Please close this PR. Thanks.

@lbscorpio lbscorpio deleted the logging-release-notes branch August 27, 2021 00:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants