Skip to content

Conversation

@rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Feb 10, 2021

RHDEVDOCS-2608
The name of the indices is {app,infra,audit]-{00000x} not {app,infra,audit]-{0000x}
https://issues.redhat.com/browse/RHDEVDOCS-2608
[enterprise-4.5][enterprise-4.6][enterprise-4.7][enterprise-4.8]

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 10, 2021
@rolfedh rolfedh changed the title RHDEVDOCS-2608 RHDEVDOCS-2608 [enterprise-4.5][enterprise-4.6][enterprise-4.7][enterprise-4.8] Feb 10, 2021
@netlify
Copy link

netlify bot commented Feb 10, 2021

Deploy preview for osdocs ready!

Built with commit ab8469f

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

@r2d2rnd
Copy link

r2d2rnd commented Feb 11, 2021

It looks good to me

@rolfedh rolfedh changed the title RHDEVDOCS-2608 [enterprise-4.5][enterprise-4.6][enterprise-4.7][enterprise-4.8] WIP RHDEVDOCS-2608 [enterprise-4.5][enterprise-4.6][enterprise-4.7][enterprise-4.8] Feb 11, 2021
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 11, 2021
@rolfedh rolfedh changed the title WIP RHDEVDOCS-2608 [enterprise-4.5][enterprise-4.6][enterprise-4.7][enterprise-4.8] RHDEVDOCS-2608 [enterprise-4.5][enterprise-4.6][enterprise-4.7][enterprise-4.8] Feb 11, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 11, 2021
@kalexand-rh kalexand-rh added this to the Next Release milestone Feb 11, 2021
@rolfedh rolfedh changed the title RHDEVDOCS-2608 [enterprise-4.5][enterprise-4.6][enterprise-4.7][enterprise-4.8] RHDEVDOCS-2608 The name of the indices is {app,infra,audit]-{00000x} not {app,infra,audit]-{0000x} Feb 12, 2021
@ahardin-rh ahardin-rh merged commit 7dfde15 into openshift:master Feb 24, 2021
@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.5

@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: #29409 failed to apply on top of branch "enterprise-4.5":

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

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 24, 2021

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

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

@ahardin-rh: new pull request created: #29812

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

@ahardin-rh: new pull request created: #29813

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.5 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants