Skip to content

RHDEVDOCS-2589#29868

Merged
ahardin-rh merged 1 commit intoopenshift:masterfrom
rolfedh:RHDEVDOCS-2589
Feb 25, 2021
Merged

RHDEVDOCS-2589#29868
ahardin-rh merged 1 commit intoopenshift:masterfrom
rolfedh:RHDEVDOCS-2589

Conversation

@rolfedh
Copy link
Copy Markdown
Contributor

@rolfedh rolfedh commented Feb 25, 2021 •
edited
Loading

OpenShift Logging: Update any installation/upgrade specific information
to use our new channels.
https://issues.redhat.com/browse/RHDEVDOCS-2589
[enterprise-4.7][enterprise-4.8]

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 25, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Feb 25, 2021 •
edited
Loading

Deploy preview for osdocs ready!

Built with commit 3cad05d

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

jcantrill
jcantrill reviewed Feb 25, 2021
View reviewed changes
Comment thread modules/cluster-logging-configuring-image-about.adoc Outdated
Comment thread modules/cluster-logging-deploy-cli.adoc Outdated
Comment thread modules/cluster-logging-log-store-status-comp.adoc Outdated
jcantrill
jcantrill reviewed Feb 25, 2021
View reviewed changes
Copy link
Copy Markdown

@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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 25, 2021
@ahardin-rh ahardin-rh added this to the Next Release milestone Feb 25, 2021
@ahardin-rh ahardin-rh added the peer-review-done Signifies that the peer review team has reviewed this PR label Feb 25, 2021
@ahardin-rh
Copy link
Copy Markdown
Contributor

ahardin-rh commented Feb 25, 2021

LGTM!

@ahardin-rh ahardin-rh merged commit ef0da76 into openshift:master Feb 25, 2021
@ahardin-rh
Copy link
Copy Markdown
Contributor

ahardin-rh commented Feb 25, 2021

/cherrypick enterprise-4.7

@ahardin-rh
Copy link
Copy Markdown
Contributor

ahardin-rh commented Feb 25, 2021

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Feb 25, 2021 •
edited by openshift-ci-robot
Loading

@ahardin-rh: #29868 failed to apply on top of branch "enterprise-4.7":

Applying: [RHDEVDOCS-2589](https://issues.redhat.com/browse/RHDEVDOCS-2589) OpenShift Logging: Update any installation/upgrade specific information to use our new channels.
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploy-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-deploy-console.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-cli.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-2589](https://issues.redhat.com/browse/RHDEVDOCS-2589) OpenShift Logging: Update any installation/upgrade specific information to use our new channels.
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.

@rolfedh
Copy link
Copy Markdown
Contributor Author

rolfedh commented Feb 25, 2021

@sichvoge FYI

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Feb 25, 2021 •
edited by openshift-ci-robot
Loading

@ahardin-rh: #29868 failed to apply on top of branch "enterprise-4.8":

Applying: [RHDEVDOCS-2589](https://issues.redhat.com/browse/RHDEVDOCS-2589) OpenShift Logging: Update any installation/upgrade specific information to use our new channels.
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploy-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-deploy-console.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-cli.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-2589](https://issues.redhat.com/browse/RHDEVDOCS-2589) OpenShift Logging: Update any installation/upgrade specific information to use our new channels.
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.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 Feb 25, 2021
Closed
ahardin-rh added a commit that referenced this pull request Feb 25, 2021
@ahardin-rh
Merge pull request #29895 from rolfedh/enterprise-4.7
1b54a72 
manual CP into 4.7 of PR #29868
@ahardin-rh ahardin-rh mentioned this pull request Feb 26, 2021
Merged
@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

@jcantrill jcantrill jcantrill left review comments

Assignees

@jcantrill jcantrill

Labels

branch/enterprise-4.7 branch/enterprise-4.8 lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

5 participants

@rolfedh @ahardin-rh @openshift-cherrypick-robot @jcantrill @openshift-ci-robot