Skip to content

Conversation

neal-timpe
Copy link
Contributor

https://issues.redhat.com/browse/OSSMDOC-262
Update productversion variable for 2.0.2 and 1.1.12 release.

https://issues.redhat.com/browse/OSSMDOC-277
Update table items and typos in custom resources.

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 9, 2021
@netlify
Copy link

netlify bot commented Mar 9, 2021

Deploy preview for osdocs ready!

Built with commit 4417bae

https://deploy-preview-30281--osdocs.netlify.app

@neal-timpe
Copy link
Contributor Author

@luksa can you take a look and approve or give feedback? I made a couple of changes based on the docs issue you filed.

@neal-timpe neal-timpe requested a review from gbaufake March 10, 2021 14:05
@neal-timpe
Copy link
Contributor Author

@yxun or @gbaufake This should be a really quick check.

@neal-timpe neal-timpe requested a review from JStickler March 10, 2021 16:02
@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.5

@openshift-cherrypick-robot

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

Applying: Marko bug
Using index info to reconstruct a base tree...
A	modules/ossm-cr-istio-global-1x.adoc
M	modules/ossm-document-attributes.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ossm-document-attributes.adoc
CONFLICT (content): Merge conflict in modules/ossm-document-attributes.adoc
CONFLICT (modify/delete): modules/ossm-cr-istio-global-1x.adoc deleted in HEAD and modified in Marko bug. Version Marko bug of modules/ossm-cr-istio-global-1x.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Marko bug
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

/cherry-pick enterprise-4.6

@openshift-cherrypick-robot

@JStickler: new pull request created: #30333

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.

@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.7

@openshift-cherrypick-robot

@JStickler: new pull request created: #30334

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
Copy link
Contributor

/cherry-pick enterprise-4.8

@openshift-cherrypick-robot

@JStickler: new pull request created: #30335

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.

@neal-timpe neal-timpe deleted the ossmdoc-277 branch March 11, 2021 14:32
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 service-mesh Label for all Service Mesh PRs size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants