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-4081 - 5.4.4, 5.3.10, 5.2.13 Z-Stream RNs #49453

Merged
merged 1 commit into from
Aug 24, 2022
Merged

RHDEVDOCS-4081 - 5.4.4, 5.3.10, 5.2.13 Z-Stream RNs #49453

merged 1 commit into from
Aug 24, 2022

Conversation

libander
Copy link
Contributor

@libander libander commented Aug 22, 2022 •
edited
Loading

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 22, 2022
@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 Aug 22, 2022
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 22, 2022
jcantrill
jcantrill reviewed Aug 22, 2022
View reviewed changes
Copy link

@jcantrill jcantrill 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 Aug 22, 2022
rolfedh
rolfedh reviewed Aug 23, 2022
View reviewed changes
modules/cluster-logging-rn-5.2.13.adoc Outdated Show resolved Hide resolved
modules/cluster-logging-rn-5.3.10.adoc Outdated Show resolved Hide resolved
modules/cluster-logging-rn-5.4.4.adoc Outdated Show resolved Hide resolved
modules/cluster-logging-rn-5.4.4.adoc Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 23, 2022
@kabirbhartiRH
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 23, 2022
@Preeticp Preeticp added this to the Continuous Release milestone Aug 24, 2022
@Preeticp Preeticp merged commit 2de7405 into openshift:main Aug 24, 2022
@Preeticp
Copy link
Contributor

/cherrypick enterprise-4.8

@Preeticp
Copy link
Contributor

/cherrypick enterprise-4.9

@Preeticp
Copy link
Contributor

/cherrypick enterprise-4.10

@Preeticp
Copy link
Contributor

/cherrypick enterprise-4.11

@Preeticp
Copy link
Contributor

/cherrypick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@Preeticp: #49453 failed to apply on top of branch "enterprise-4.8":

Applying: RHDEVDOCS-4081 - Logging Z-Stream Release Notes: 5.2.13, 5.3.10, 5.4.4 w/ peer review 2 & QE
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-4081 - Logging Z-Stream Release Notes: 5.2.13, 5.3.10, 5.4.4 w/ peer review 2 & QE
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.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.

@openshift-cherrypick-robot
Copy link

@Preeticp: #49453 failed to apply on top of branch "enterprise-4.9":

Applying: RHDEVDOCS-4081 - Logging Z-Stream Release Notes: 5.2.13, 5.3.10, 5.4.4 w/ peer review 2 & QE
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-4081 - Logging Z-Stream Release Notes: 5.2.13, 5.3.10, 5.4.4 w/ peer review 2 & QE
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.9

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 Aug 24, 2022
Merged
@openshift-cherrypick-robot
Copy link

@Preeticp: new pull request created: #49537

In response to this:

/cherrypick enterprise-4.10

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 Aug 24, 2022
Merged
@openshift-cherrypick-robot
Copy link

@Preeticp: new pull request created: #49538

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.

@openshift-cherrypick-robot
Copy link

@Preeticp: new pull request created: #49539

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 Aug 24, 2022
Merged
@libander libander deleted the RHDEVDOCS-4081 branch May 2, 2024 05:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jcantrill jcantrill jcantrill left review comments

@kabirbhartiRH kabirbhartiRH kabirbhartiRH left review comments

@rolfedh rolfedh rolfedh approved these changes

Assignees

@jcantrill jcantrill

@kabirbhartiRH kabirbhartiRH

Labels
branch/enterprise-4.8 branch/enterprise-4.9 branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs lgtm Indicates that a PR is ready to be merged. 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.
6 participants
@libander @kabirbhartiRH @Preeticp @openshift-cherrypick-robot @rolfedh @jcantrill