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

OSSMDOC-138 #27465

Merged
merged 1 commit into from
Nov 19, 2020
Merged

OSSMDOC-138 #27465

merged 1 commit into from
Nov 19, 2020

Conversation

neal-timpe
Copy link
Contributor

@neal-timpe neal-timpe commented Nov 17, 2020

https://issues.redhat.com/browse/OSSMDOC-138

This needs to be merged to 4.4-4.7.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 17, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@JStickler JStickler merged commit ff597b8 into openshift:master Nov 19, 2020
@JStickler
Copy link
Contributor

JStickler commented Nov 19, 2020

/cherry-pick enterprise-4.4

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 19, 2020

@JStickler: #27465 failed to apply on top of branch "enterprise-4.4":

Applying: elasticsearch note
Using index info to reconstruct a base tree...
M	modules/jaeger-install-elasticsearch.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/jaeger-install-elasticsearch.adoc
CONFLICT (content): Merge conflict in modules/jaeger-install-elasticsearch.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 elasticsearch note
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:

/cherry-pick enterprise-4.4

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.

@JStickler
Copy link
Contributor

JStickler commented Nov 19, 2020

/cherry-pick enterprise-4.5

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 19, 2020

@JStickler: #27465 failed to apply on top of branch "enterprise-4.5":

Applying: elasticsearch note
Using index info to reconstruct a base tree...
M	modules/jaeger-install-elasticsearch.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/jaeger-install-elasticsearch.adoc
CONFLICT (content): Merge conflict in modules/jaeger-install-elasticsearch.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 elasticsearch note
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:

/cherry-pick 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.

@JStickler
Copy link
Contributor

JStickler commented Nov 19, 2020

/cherry-pick enterprise-4.6

@JStickler
Copy link
Contributor

JStickler commented Nov 19, 2020

/cherry-pick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 19, 2020

@JStickler: new pull request created: #27502

In response to this:

/cherry-pick 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 Nov 19, 2020

@JStickler: new pull request created: #27503

In response to this:

/cherry-pick 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.

JStickler added a commit that referenced this pull request Nov 19, 2020
PR to merge #OSSMDOC-138 #27465 - elasticsearch note to 4.4 branch
JStickler added a commit that referenced this pull request Nov 19, 2020
PR to merge #OSSMDOC-138 #27465 elasticsearch note to 4.5 branch
@neal-timpe neal-timpe deleted the ossmdoc-138 branch November 20, 2020 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet

6 participants