Skip to content

GH#16954 - Add examples for route allow list#26631

Merged
jboxman merged 1 commit intoopenshift:masterfrom
jboxman-rh:gh-16954
Oct 30, 2020
Merged

GH#16954 - Add examples for route allow list#26631
jboxman merged 1 commit intoopenshift:masterfrom
jboxman-rh:gh-16954

Conversation

@openshift-docs-preview-bot

The preview will be available shortly at:

@jboxman jboxman changed the title Add examples for route allow list GH#16954 - Add examples for route allow list Oct 23, 2020
@lihongan
Copy link

LGTM. thank you @jboxman

@jboxman jboxman added the peer-review-needed Signifies that the peer review team needs to review this PR label Oct 28, 2020
@lbarbeevargas lbarbeevargas self-requested a review October 28, 2020 15:12
Copy link
Contributor

@lbarbeevargas lbarbeevargas left a comment

Choose a reason for hiding this comment

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

@jboxman Just one small suggestion, but otherwise LGTM!

@lbarbeevargas lbarbeevargas 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 Oct 28, 2020
@jboxman jboxman merged commit 5a9cf04 into openshift:master Oct 30, 2020
@jboxman jboxman deleted the gh-16954 branch October 30, 2020 19:15
@jboxman
Copy link
Contributor Author

jboxman commented Oct 30, 2020

/cherry-pick enterprise-4.7

@jboxman
Copy link
Contributor Author

jboxman commented Oct 30, 2020

/cherry-pick enterprise-4.6

@jboxman
Copy link
Contributor Author

jboxman commented Oct 30, 2020

/cherry-pick enterprise-4.5

@jboxman
Copy link
Contributor Author

jboxman commented Oct 30, 2020

/cherry-pick enterprise-4.4

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 30, 2020

@jboxman: #26631 failed to apply on top of branch "enterprise-4.5":

Applying: Add examples for route allow list
Using index info to reconstruct a base tree...
M	modules/nw-route-specific-annotations.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-route-specific-annotations.adoc
CONFLICT (content): Merge conflict in modules/nw-route-specific-annotations.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 Add examples for route allow list
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:

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

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 30, 2020

@jboxman: new pull request created: #26958

Details

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

openshift-cherrypick-robot commented Oct 30, 2020

@jboxman: #26631 failed to apply on top of branch "enterprise-4.4":

Applying: Add examples for route allow list
Using index info to reconstruct a base tree...
M	modules/nw-route-specific-annotations.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-route-specific-annotations.adoc
CONFLICT (content): Merge conflict in modules/nw-route-specific-annotations.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 Add examples for route allow list
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:

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

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 30, 2020

@jboxman: new pull request created: #26959

Details

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.

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 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

Development

Successfully merging this pull request may close these issues.

6 participants