Skip to content

Conversation

@JStickler
Copy link
Contributor

I had two PRs open in different tabs and merged #20643 by accident while I was trying to troubleshoot build errors. This PR contains all the changes from that PR.

@openshift-docs-preview-bot

The preview will be available shortly at:

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 30, 2020
@objectiser
Copy link

objectiser commented Jun 1, 2020

@JStickler On re-reading the PR, do you think we need a more explicit statement that Jaeger has been tested (and is supported) with AMQ streams, rather than other kafka products?

@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 2, 2020
@JStickler
Copy link
Contributor Author

@objectiser, rather than hold up this PR, why don't we create an issue so that we can work out what to say (and where to put the content, since we don't have a "supported configurations" topic yet, and should probably add one).

@objectiser
Copy link

@JStickler Created https://issues.redhat.com/browse/TRACING-1212 to track that. Added to sprint #41 but feel free to schedule in whichever sprint you think appropriate.

@JStickler JStickler force-pushed the BOJ_03a branch 5 times, most recently from 4948b44 to b6a3bb1 Compare June 3, 2020 14:35
Copy link
Contributor

@neal-timpe neal-timpe left a comment

Choose a reason for hiding this comment

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

I think there are a couple of items that need review before merging.

@JStickler JStickler force-pushed the BOJ_03a branch 2 times, most recently from 6981a34 to b2329c9 Compare June 3, 2020 16:25
@neal-timpe neal-timpe merged commit 9a39122 into openshift:master Jun 3, 2020
@neal-timpe
Copy link
Contributor

/cherry-pick enterprise-4.3

@openshift-cherrypick-robot

@neal-timpe: #22296 failed to apply on top of branch "enterprise-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/jaeger-install-elasticsearch.adoc
A	pipelines/op-release-notes.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pipelines/op-release-notes.adoc deleted in HEAD and modified in Jaeger configuration docs, accidentally merged previously.. Version Jaeger configuration docs, accidentally merged previously. of pipelines/op-release-notes.adoc left in tree.
Auto-merging modules/jaeger-install-elasticsearch.adoc
Auto-merging _topic_map.yml
Patch failed at 0001 Jaeger configuration docs, accidentally merged previously.

Details

In response to this:

/cherry-pick enterprise-4.3

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.

@neal-timpe
Copy link
Contributor

/cherry-pick enterprise-4.4

@openshift-cherrypick-robot

@neal-timpe: new pull request created: #22629

Details

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.

@neal-timpe
Copy link
Contributor

/cherry-pick enterprise-4.5

@openshift-cherrypick-robot

@neal-timpe: new pull request created: #22630

Details

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 added a commit to JStickler/openshift-docs that referenced this pull request Jun 3, 2020
neal-timpe added a commit that referenced this pull request Jun 3, 2020
@JStickler JStickler deleted the BOJ_03a branch November 11, 2020 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants