Skip to content

Rhdevdocs 2752#30170

Merged
codyhoag merged 1 commit intoopenshift:masterfrom
rolfedh:RHDEVDOCS-2752
Mar 8, 2021
Merged

Rhdevdocs 2752#30170
codyhoag merged 1 commit intoopenshift:masterfrom
rolfedh:RHDEVDOCS-2752

Conversation

@rolfedh
Copy link
Copy Markdown
Contributor

@rolfedh rolfedh commented Mar 6, 2021

RHDEVDOCS-2752 Fix issue: [enterprise-4.7] Indentation problem on logging installation docs
Fixes #30052, same as https://issues.redhat.com/browse/RHDEVDOCS-2752
Also fixes [enterprise-4.7] A sample CustomResource file has a syntax error in Installing OpenShift Logging #29909
Also fixes https://bugzilla.redhat.com/show_bug.cgi?id=1933110
[enterprise-4.5]
[enterprise-4.6]
[enterprise-4.7]
[enterprise-4.8]

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 6, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Mar 6, 2021

Deploy preview for osdocs ready!

Built with commit ef98f47

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

@rolfedh
Copy link
Copy Markdown
Contributor Author

rolfedh commented Mar 6, 2021

@anpingli Please verify the changes to the yaml in this PR. Thank you.

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 7, 2021
Copy link
Copy Markdown

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

Shall we use the default memory 256Mi? The other part /lgtm

@rolfedh
Copy link
Copy Markdown
Contributor Author

rolfedh commented Mar 8, 2021

Shall we use the default memory 256Mi? The other part /lgtm

Updated to 256Mi. Thanks.

@codyhoag codyhoag self-requested a review March 8, 2021 14:43
Copy link
Copy Markdown
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

LGTM

@codyhoag codyhoag merged commit 0d6eeb0 into openshift:master Mar 8, 2021
@codyhoag
Copy link
Copy Markdown
Contributor

codyhoag commented Mar 8, 2021

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link
Copy Markdown

@codyhoag: new pull request created: #30194

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.

@codyhoag
Copy link
Copy Markdown
Contributor

codyhoag commented Mar 8, 2021

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link
Copy Markdown

@codyhoag: new pull request created: #30195

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.

@codyhoag
Copy link
Copy Markdown
Contributor

codyhoag commented Mar 8, 2021

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link
Copy Markdown

@codyhoag: new pull request created: #30196

Details

In response to this:

/cherrypick enterprise-4.6

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.

@codyhoag
Copy link
Copy Markdown
Contributor

codyhoag commented Mar 8, 2021

/cherrypick enterprise-4.5

@openshift-cherrypick-robot
Copy link
Copy Markdown

@codyhoag: #30170 failed to apply on top of branch "enterprise-4.5":

Applying: RHDEVDOCS-2752 Fix issue: Indentation problem on logging installation docs #30052
Using index info to reconstruct a base tree...
M	modules/cluster-logging-about-crd.adoc
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploy-console.adoc
M	modules/cluster-logging-logstore-limits.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-logstore-limits.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-logstore-limits.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
Auto-merging modules/cluster-logging-about-crd.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-2752 Fix issue: Indentation problem on logging installation docs #30052
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.5

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

Projects

None yet

6 participants