openshift-docs
openshift-docs copied to clipboard
openshift
OSSM-6304 [DOC] Reorg and Deprecation Notice for Jaeger and Elasitcsearch
OSSM-6304 [DOC] Reorg and Deprecation Notice for Jaeger and Elasitcsearch
Version(s): 4.12+
Issue: https://issues.redhat.com/browse/OSSM-6304
Link to docs preview: https://75458--ocpdocs-pr.netlify.app/openshift-enterprise/latest/service_mesh/v2x/installing-ossm.html
QE review:
- [ ] QE has approved this change.
Additional information:
🤖 Tue May 28 17:09:38 - Prow CI generated the docs preview: https://75458--ocpdocs-pr.netlify.app Complete list of updated preview URLs: artifacts/updated_preview_urls.txt
@gwynnemonahan: all tests passed!
Full PR test history. Your PR dashboard.
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-sigs/prow repository. I understand the commands that are listed here.
![openshift-ci[bot] avatar](https://avatars.githubusercontent.com/in/91280?v=4 "Published by a pub.dev verified publisher"){kind=small}
@adellape: new pull request created: #76617
In response to this:
/cherrypick enterprise-4.16
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-sigs/prow repository.
@adellape: new pull request created: #76618
In response to this:
/cherrypick enterprise-4.15
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-sigs/prow repository.
@adellape: new pull request created: #76619
In response to this:
/cherrypick enterprise-4.14
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-sigs/prow repository.
@adellape: #75458 failed to apply on top of branch "enterprise-4.13":
Applying: OSSM-6304 [DOC] Reorg and Deprecation Notice for Jaeger and Elasitcsearch
Using index info to reconstruct a base tree...
M modules/ossm-install-ossm-operator.adoc
M modules/ossm-installation-activities.adoc
M post_installation_configuration/network-configuration.adoc
M service_mesh/v2x/ossm-reference-jaeger.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/ossm-reference-jaeger.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/ossm-reference-jaeger.adoc
Auto-merging post_installation_configuration/network-configuration.adoc
Auto-merging modules/ossm-installation-activities.adoc
CONFLICT (content): Merge conflict in modules/ossm-installation-activities.adoc
Auto-merging modules/ossm-install-ossm-operator.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 OSSM-6304 [DOC] Reorg and Deprecation Notice for Jaeger and Elasitcsearch
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:
/cherrypick enterprise-4.13
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-sigs/prow repository.
@adellape: #75458 failed to apply on top of branch "enterprise-4.12":
Applying: OSSM-6304 [DOC] Reorg and Deprecation Notice for Jaeger and Elasitcsearch
Using index info to reconstruct a base tree...
M modules/ossm-install-ossm-operator.adoc
M modules/ossm-installation-activities.adoc
M post_installation_configuration/network-configuration.adoc
M service_mesh/v2x/installing-ossm.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/installing-ossm.adoc
Auto-merging post_installation_configuration/network-configuration.adoc
Auto-merging modules/ossm-installation-activities.adoc
CONFLICT (content): Merge conflict in modules/ossm-installation-activities.adoc
Auto-merging modules/ossm-install-ossm-operator.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 OSSM-6304 [DOC] Reorg and Deprecation Notice for Jaeger and Elasitcsearch
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:
/cherrypick enterprise-4.12
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-sigs/prow repository.