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.

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

RHDEVDOCS-3023 Clean up trailing instances of CLO #34422

Merged
merged 1 commit into from
Jul 15, 2021
Merged

RHDEVDOCS-3023 Clean up trailing instances of CLO #34422

merged 1 commit into from
Jul 15, 2021

Conversation

rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Jul 8, 2021

In OpenShift Logging 5.0 and later, the Cluster Logging Operator is called Red Hat OpenShift Logging Operator. This PR replaces a few instances of the old name or, where it makes sense to keep the old name, comments on them.

Approved by:

All reviews complete. Ready to merge.

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 8, 2021
@netlify
Copy link

netlify bot commented Jul 8, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 2e6c3b4

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/60e72ba4b88d880008918ae0

😎 Browse the preview: https://deploy-preview-34422--osdocs.netlify.app

Copy link
Contributor

@jc-berger jc-berger left a comment

Choose a reason for hiding this comment

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

LGTM from doc's point of view. Good work!

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

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 Jul 15, 2021
@Preeticp Preeticp added branch/enterprise-4.7 branch/enterprise-4.8 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 labels Jul 15, 2021
@Preeticp Preeticp merged commit c3812fd into openshift:master Jul 15, 2021
@Preeticp
Copy link
Contributor

/cherrypick enterprise-4.7

@Preeticp
Copy link
Contributor

/cherrypick enterprise-4.8

@openshift-cherrypick-robot

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

Applying: RHDEVDOCS-3023 Clean up trailing instances of CLO
Using index info to reconstruct a base tree...
M	contributing_to_docs/doc_guidelines.adoc
M	welcome/oke_about.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/oke_about.adoc
CONFLICT (content): Merge conflict in welcome/oke_about.adoc
Auto-merging contributing_to_docs/doc_guidelines.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-3023 Clean up trailing instances of CLO
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.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

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

Applying: RHDEVDOCS-3023 Clean up trailing instances of CLO
Using index info to reconstruct a base tree...
M	contributing_to_docs/doc_guidelines.adoc
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
Auto-merging contributing_to_docs/doc_guidelines.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-3023 Clean up trailing instances of CLO
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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.7 branch/enterprise-4.8 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants