Skip to content

Conversation

JStickler
Copy link
Contributor

@JStickler JStickler commented Dec 2, 2020

Resolve incorrect heading levels that are generating build errors/warnings.
Split Removing Service Mesh into it's own module.
Remove hard coded numbering.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 2, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@JStickler JStickler added the service-mesh Label for all Service Mesh PRs label Dec 2, 2020
@JStickler JStickler requested a review from neal-timpe December 2, 2020 22:57
@neal-timpe
Copy link
Contributor

neal-timpe commented Dec 4, 2020

/cherry-pick enterprise-4.4

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 4, 2020

@neal-timpe: #27812 failed to apply on top of branch "enterprise-4.4":

Applying: [OSSMDOC-162](https://issues.redhat.com/browse/OSSMDOC-162) Resolve headings generating errors.
Using index info to reconstruct a base tree...
M	_topic_map.yml
A	modules/ossm-security-cert-manage-1x.adoc
M	modules/ossm-security-cert-manage.adoc
M	service_mesh/v1x/installing-ossm.adoc
M	service_mesh/v2x/installing-ossm.adoc
M	service_mesh/v2x/ossm-architecture.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/ossm-architecture.adoc
Auto-merging service_mesh/v2x/installing-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/installing-ossm.adoc
Auto-merging service_mesh/v1x/installing-ossm.adoc
Auto-merging modules/ossm-security-cert-manage.adoc
CONFLICT (content): Merge conflict in modules/ossm-security-cert-manage.adoc
CONFLICT (modify/delete): modules/ossm-security-cert-manage-1x.adoc deleted in HEAD and modified in [OSSMDOC-162](https://issues.redhat.com/browse/OSSMDOC-162) Resolve headings generating errors.. Version [OSSMDOC-162](https://issues.redhat.com/browse/OSSMDOC-162) Resolve headings generating errors. of modules/ossm-security-cert-manage-1x.adoc left in tree.
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
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-162](https://issues.redhat.com/browse/OSSMDOC-162) Resolve headings generating errors.
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.

@neal-timpe
Copy link
Contributor

neal-timpe commented Dec 4, 2020

/cherry-pick enterprise-4.5

@neal-timpe
Copy link
Contributor

neal-timpe commented Dec 4, 2020

/cherry-pick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 4, 2020

@neal-timpe: #27812 failed to apply on top of branch "enterprise-4.5":

Applying: [OSSMDOC-162](https://issues.redhat.com/browse/OSSMDOC-162) Resolve headings generating errors.
Using index info to reconstruct a base tree...
M	_topic_map.yml
A	modules/ossm-security-cert-manage-1x.adoc
M	modules/ossm-security-cert-manage.adoc
M	service_mesh/v1x/installing-ossm.adoc
M	service_mesh/v2x/installing-ossm.adoc
M	service_mesh/v2x/ossm-architecture.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/ossm-architecture.adoc
Auto-merging service_mesh/v2x/installing-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/installing-ossm.adoc
Auto-merging service_mesh/v1x/installing-ossm.adoc
Auto-merging modules/ossm-security-cert-manage.adoc
CONFLICT (content): Merge conflict in modules/ossm-security-cert-manage.adoc
CONFLICT (modify/delete): modules/ossm-security-cert-manage-1x.adoc deleted in HEAD and modified in [OSSMDOC-162](https://issues.redhat.com/browse/OSSMDOC-162) Resolve headings generating errors.. Version [OSSMDOC-162](https://issues.redhat.com/browse/OSSMDOC-162) Resolve headings generating errors. of modules/ossm-security-cert-manage-1x.adoc left in tree.
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
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-162](https://issues.redhat.com/browse/OSSMDOC-162) Resolve headings generating errors.
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.

@neal-timpe
Copy link
Contributor

neal-timpe commented Dec 4, 2020

/cherry-pick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 4, 2020

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

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 Dec 4, 2020

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

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 to JStickler/openshift-docs that referenced this pull request Dec 4, 2020
JStickler added a commit to JStickler/openshift-docs that referenced this pull request Dec 7, 2020
JStickler added a commit that referenced this pull request Dec 7, 2020
JStickler added a commit that referenced this pull request Dec 7, 2020
@JStickler JStickler deleted the OSSMDOC-162 branch January 21, 2021 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.4 branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 service-mesh Label for all Service Mesh PRs size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants