Skip to content

[srvls] [SRVKS-693] Route docs for serverless #29621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 5, 2021
Merged

[srvls] [SRVKS-693] Route docs for serverless #29621

merged 1 commit into from
Mar 5, 2021

Conversation

abrennan89
Copy link
Contributor

No description provided.

@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/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 19, 2021
@netlify
Copy link

netlify bot commented Feb 19, 2021 •
edited
Loading

Deploy preview for osdocs ready!

Built with commit 8225720

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

@abrennan89 abrennan89 force-pushed the SRVKS-693 branch 3 times, most recently from 324e0ea to 6c5e333 Compare March 2, 2021 15:00
nak3
nak3 reviewed Mar 3, 2021
View reviewed changes
Copy link
Contributor

@nak3 nak3 left a comment

Choose a reason for hiding this comment

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

Thank you! I left a few comments.

@abrennan89 abrennan89 force-pushed the SRVKS-693 branch 2 times, most recently from dc8dd1f to 404c95a Compare March 4, 2021 14:37
@nak3
Copy link
Contributor

nak3 commented Mar 4, 2021

/lgtm

Thank you!

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2021
@abrennan89 abrennan89 changed the title [WIP] [srvls] [SRVKS-693] Route docs for serverless [srvls] [SRVKS-693] Route docs for serverless Mar 4, 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 Mar 4, 2021
maschmid
maschmid reviewed Mar 4, 2021
View reviewed changes
maschmid
maschmid reviewed Mar 4, 2021
View reviewed changes
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2021
@maschmid
Copy link
Contributor

maschmid commented Mar 5, 2021

QE approved

codyhoag
codyhoag reviewed Mar 5, 2021
View reviewed changes
Copy link
Contributor

@codyhoag codyhoag left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Just a few nits; looks good otherwise!

@codyhoag codyhoag added serverless Label for all Serverless PRs peer-review-done Signifies that the peer review team has reviewed this PR labels Mar 5, 2021
@codyhoag codyhoag added this to the Next Release milestone Mar 5, 2021
@codyhoag codyhoag merged commit 2c916ab into openshift:master Mar 5, 2021
@codyhoag
Copy link
Contributor

codyhoag commented Mar 5, 2021

/cherrypick enterprise-4.8

@codyhoag
Copy link
Contributor

codyhoag commented Mar 5, 2021

/cherrypick enterprise-4.7

@codyhoag
Copy link
Contributor

codyhoag commented Mar 5, 2021

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link

@codyhoag: #29621 failed to apply on top of branch "enterprise-4.8":

Applying: Route docs for serverless
Using index info to reconstruct a base tree...
M	_topic_map.yml
A	serverless/networking/serverless-domain-mapping.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): serverless/networking/serverless-domain-mapping.adoc deleted in HEAD and modified in Route docs for serverless. Version Route docs for serverless of serverless/networking/serverless-domain-mapping.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 Route docs for serverless
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.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 openshift-cherrypick-robot mentioned this pull request Mar 5, 2021
Merged
@openshift-cherrypick-robot
Copy link

@codyhoag: new pull request created: #30161

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 5, 2021
Merged
@openshift-cherrypick-robot
Copy link

@codyhoag: new pull request created: #30162

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.

@codyhoag
Copy link
Contributor

codyhoag commented Mar 5, 2021

/cherrypick enterprise-4.8

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 5, 2021
Merged
@openshift-cherrypick-robot
Copy link

@codyhoag: new pull request created: #30164

In response to this:

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

@nak3 nak3 mentioned this pull request Jun 22, 2021
Merged
@abrennan89 abrennan89 deleted the SRVKS-693 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

@aburdenthehand aburdenthehand Awaiting requested review from aburdenthehand

@jeana-redhat jeana-redhat Awaiting requested review from jeana-redhat

@vikram-redhat vikram-redhat Awaiting requested review from vikram-redhat

3 more reviewers

@maschmid maschmid maschmid left review comments

@codyhoag codyhoag codyhoag left review comments

@nak3 nak3 nak3 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@nak3 nak3

Labels

branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR serverless Label for all Serverless PRs size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

6 participants

@abrennan89 @nak3 @openshift-ci-robot @maschmid @codyhoag @openshift-cherrypick-robot