Skip to content

Conversation

@rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Feb 15, 2021

[DOCS] Alert manager modifications in cluster logging storage
recommendations
Apply to;
[enterprise-4.6]
[enterprise-4.7]

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

netlify bot commented Feb 15, 2021

Deploy preview for osdocs ready!

Built with commit 9ac6a6e

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

@rolfedh
Copy link
Contributor Author

rolfedh commented Feb 15, 2021

@ewolinetz Hi Eric - I'm asking subject matter experts to reviews doc changes on a round-robin basis. Would you review this small doc change for https://issues.redhat.com/browse/RHDEVDOCS-2617 (and, by extension, https://bugzilla.redhat.com/show_bug.cgi?id=1886346)?

I also removed some line-breaks from some mostly commented-out text while I was in there. You can disregard those changes.

Copy link
Contributor

@jboxman jboxman left a comment

Choose a reason for hiding this comment

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

A comment; LGTM.

@jboxman jboxman added the peer-review-done Signifies that the peer review team has reviewed this PR label Feb 17, 2021
@ahardin-rh ahardin-rh merged commit ebdf7de into openshift:master Feb 24, 2021
@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.6

@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.7

@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 24, 2021

@ahardin-rh: #29491 failed to apply on top of branch "enterprise-4.6":

Applying: [RHDEVDOCS-2617](https://issues.redhat.com/browse/RHDEVDOCS-2617) [DOCS] Alert manager modifications in cluster logging storage recommendations
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-storage-considerations.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-deploy-storage-considerations.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-storage-considerations.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-2617](https://issues.redhat.com/browse/RHDEVDOCS-2617) [DOCS] Alert manager modifications in cluster logging storage recommendations
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.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.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 24, 2021

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

Applying: [RHDEVDOCS-2617](https://issues.redhat.com/browse/RHDEVDOCS-2617) [DOCS] Alert manager modifications in cluster logging storage recommendations
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-storage-considerations.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-deploy-storage-considerations.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-storage-considerations.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-2617](https://issues.redhat.com/browse/RHDEVDOCS-2617) [DOCS] Alert manager modifications in cluster logging storage recommendations
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.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 24, 2021

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

Applying: [RHDEVDOCS-2617](https://issues.redhat.com/browse/RHDEVDOCS-2617) [DOCS] Alert manager modifications in cluster logging storage recommendations
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-storage-considerations.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-deploy-storage-considerations.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-storage-considerations.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-2617](https://issues.redhat.com/browse/RHDEVDOCS-2617) [DOCS] Alert manager modifications in cluster logging storage recommendations
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.

@ahardin-rh
Copy link
Contributor

@rolfedh The cherrypick bot failed for each branch, so you will need to manually cherry-pick these changes. Please let me know if you need assistance. Thanks!

ahardin-rh added a commit that referenced this pull request Mar 2, 2021
ahardin-rh added a commit that referenced this pull request Mar 2, 2021
ahardin-rh added a commit that referenced this pull request Mar 2, 2021
@rolfedh
Copy link
Contributor Author

rolfedh commented Mar 2, 2021

Manually cherry picked these to enterprise-4.6, 4.7, and 4.7 and fixed any merge conflicts with:
#30013
#30016
#30018

@yuvalk yuvalk mentioned this pull request Mar 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 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.

7 participants