Skip to content

Conversation

rh-tokeefe
Copy link
Contributor

@rh-tokeefe rh-tokeefe commented Aug 24, 2021

Deleted one line and revised another based on story description. Changes were made for the v2 file. v1 was left unchanged.

Cherry pick to 4.6, 4.7, 4.8, and 4.9

@JStickler please let me know if you find anything I need to revise. Thanks!

Preview link: https://deploy-preview-35770--osdocs.netlify.app/openshift-enterprise/latest/service_mesh/v2x/preparing-ossm-installation.html#ossm-supported-configurations_preparing-ossm-installation

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 24, 2021
@netlify
Copy link

netlify bot commented Aug 24, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 572c731

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/6137b6c76185e40007ee013e

😎 Browse the preview: https://deploy-preview-35770--osdocs.netlify.app

Copy link
Contributor

Choose a reason for hiding this comment

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

@rh-tokeefe The only concern: "...cluster in which it operates". Maybe I'm lacking context or just don't understand something but it's not entirely clear to me what is meant by "it". Should it be "they" or maybe clarified further?

@rh-tokeefe
Copy link
Contributor Author

Thank you for the feedback @missmesss. I changed the content. In place of "in which it operates," the topic now reads "...in which the Service Mesh operates." I will submit the change and squash the commits.

@JStickler
Copy link
Contributor

@rcernich

The deployment must be contained to a single {product-title} cluster that is not federated.

Should this be
" * The deployment must be contained to a single {product-title} cluster."

Or is it correct to delete the entire line for 2.1.

@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.6

@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.7

@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.8

@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.9

@openshift-cherrypick-robot

@JStickler: #35770 failed to apply on top of branch "enterprise-4.6":

Applying: OSSMDOC-213: edit to update existing federation reference.
Using index info to reconstruct a base tree...
M	modules/ossm-supported-configurations.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ossm-supported-configurations.adoc
CONFLICT (content): Merge conflict in modules/ossm-supported-configurations.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 OSSMDOC-213: edit to update existing federation reference.
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.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

@JStickler: #35770 failed to apply on top of branch "enterprise-4.7":

Applying: OSSMDOC-213: edit to update existing federation reference.
Using index info to reconstruct a base tree...
M	modules/ossm-supported-configurations.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ossm-supported-configurations.adoc
CONFLICT (content): Merge conflict in modules/ossm-supported-configurations.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 OSSMDOC-213: edit to update existing federation reference.
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.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

@JStickler: new pull request created: #36162

In response to this:

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

@openshift-cherrypick-robot

@JStickler: new pull request created: #36163

In response to this:

/cherry-pick enterprise-4.9

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.6 branch/enterprise-4.7 branch/enterprise-4.8 branch/enterprise-4.9 service-mesh Label for all Service Mesh PRs 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.

5 participants