Skip to content

[enterprise-3.7] bug 1656374 added notes for NetworkPolicy feature support #14428

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
sheriff-rh merged 1 commit into from
Apr 11, 2019
Merged

[enterprise-3.7] bug 1656374 added notes for NetworkPolicy feature support #14428

sheriff-rh merged 1 commit into from
Apr 11, 2019

Conversation

@sheriff-rh
Copy link
Contributor

@sheriff-rh sheriff-rh commented Apr 11, 2019

Cherry pick of #14352

@sheriff-rh sheriff-rh added this to the Next Release milestone Apr 11, 2019
@sheriff-rh sheriff-rh self-assigned this Apr 11, 2019
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 11, 2019
@sheriff-rh sheriff-rh merged commit f9d5c99 into openshift:enterprise-3.7 Apr 11, 2019
@sheriff-rh
Copy link
Contributor Author

sheriff-rh commented Apr 11, 2019

/cherrypick enterprise-3.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Apr 11, 2019

@sheriff-rh: #14428 failed to apply on top of branch "enterprise-3.6":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	admin_guide/managing_networking.adoc
M	install_config/configuring_sdn.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/configuring_sdn.adoc
Auto-merging admin_guide/managing_networking.adoc
CONFLICT (content): Merge conflict in admin_guide/managing_networking.adoc
Patch failed at 0001 bug 1656374 added notes for NetworkPolicy feature support
Details

In response to this:

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

@sheriff-rh sheriff-rh changed the title bug 1656374 added notes for NetworkPolicy feature support [enterprise-3.7] bug 1656374 added notes for NetworkPolicy feature support Apr 11, 2019
@sheriff-rh
Copy link
Contributor Author

sheriff-rh commented Apr 11, 2019

Looks like NetworkPolicy was tech preview only in 3.6, so I will not be cherry-picking to enterprise-3.6.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@sheriff-rh sheriff-rh

Labels

size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

3 participants

@sheriff-rh @openshift-cherrypick-robot @openshift-ci-robot