Skip to content

[SRVCOM-967] Updating terms and clean up serverless docs sections#28429

Merged
bergerhoffer merged 1 commit intoopenshift:masterfrom
abrennan89:glossary01
Jan 28, 2021
Merged

[SRVCOM-967] Updating terms and clean up serverless docs sections#28429
bergerhoffer merged 1 commit intoopenshift:masterfrom
abrennan89:glossary01

Conversation

@abrennan89
Copy link
Copy Markdown
Contributor

@abrennan89 abrennan89 commented Jan 7, 2021 •
edited
Loading

Can be CP'd to 4.6, 4.7. I will manually CP the changes to 4.4, 4.5 just in case there are any conflicts.

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 7, 2021
@abrennan89 abrennan89 changed the title [WIP] [SRVCOM-967] Updating terms and clean up serverless docs sections [SRVCOM-967] Updating terms and clean up serverless docs sections Jan 19, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 19, 2021
bergerhoffer
bergerhoffer reviewed Jan 19, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@bergerhoffer bergerhoffer left a comment

Choose a reason for hiding this comment

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

Just two minor things.

I've marked this for 4.4-4.7, but am happy to let you do the manual cherry picks of 4.4 and 4.5 whenever it comes time. I can always try the bot first and see if it would pick successfully though, just let me know!

Comment thread serverless/installing_serverless/installing-openshift-serverless.adoc Outdated
Comment thread modules/serverless-cluster-sizing-req.adoc Outdated
@bergerhoffer bergerhoffer added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jan 19, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Jan 28, 2021

Deploy preview for osdocs ready!

Built with commit fc12b10809e634c998bda8f9c1b4e2a17ef5319d

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

bergerhoffer
bergerhoffer reviewed Jan 28, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@bergerhoffer bergerhoffer left a comment

Choose a reason for hiding this comment

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

LGTM!

@netlify
Copy link
Copy Markdown

netlify Bot commented Jan 28, 2021

Deploy preview for osdocs ready!

Built with commit 9a4f959

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

@bergerhoffer bergerhoffer merged commit a88a562 into openshift:master Jan 28, 2021
@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented Jan 28, 2021 •
edited by openshift-ci-robot
Loading

/cherrypick enterprise-4.7

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 28, 2021
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jan 28, 2021 •
edited by openshift-ci-robot
Loading

@bergerhoffer: new pull request created: #28930

Details

In response to this:

/cherrypick 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.

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented Jan 28, 2021 •
edited by openshift-ci-robot
Loading

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jan 28, 2021 •
edited by openshift-ci-robot
Loading

@bergerhoffer: new pull request created: #28931

Details

In response to this:

/cherrypick 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 openshift-cherrypick-robot mentioned this pull request Jan 28, 2021
Merged
@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented Jan 28, 2021 •
edited by openshift-ci-robot
Loading

/cherrypick enterprise-4.5

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jan 28, 2021 •
edited by openshift-ci-robot
Loading

@bergerhoffer: #28429 failed to apply on top of branch "enterprise-4.5":

Applying: Updating terms and clean up serverless docs sections
Using index info to reconstruct a base tree...
M	serverless/installing_serverless/installing-openshift-serverless.adoc
Falling back to patching base and 3-way merge...
Auto-merging serverless/installing_serverless/installing-openshift-serverless.adoc
CONFLICT (content): Merge conflict in serverless/installing_serverless/installing-openshift-serverless.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 Updating terms and clean up serverless docs sections
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".
Details

In response to this:

/cherrypick 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.

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented Jan 28, 2021

@abrennan89 4.6 and 4.7 CPs are merged. Let me know when you open the manual CPs for 4.4 and 4.5. Thanks!

This was referenced Jan 28, 2021
Merged
Merged
@abrennan89 abrennan89 deleted the glossary01 branch December 17, 2021 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bergerhoffer bergerhoffer bergerhoffer left review comments

Assignees

No one assigned

Labels

branch/enterprise-4.4 branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@abrennan89 @bergerhoffer @openshift-cherrypick-robot @openshift-ci-robot