Skip to content

Conversation

@miabbott
Copy link
Member

No description provided.

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Dec 10, 2020
@openshift-ci-robot
Copy link

@miabbott: This pull request references Bugzilla bug 1902584, which is invalid:

  • expected Bugzilla bug 1902584 to depend on a bug in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1902584: note workaround for advanced networking issues

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-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 10, 2020
@miabbott
Copy link
Member Author

I can create a new bug if needed, but this is changes based on feedback from the original BZ

@jboxman
Copy link
Contributor

jboxman commented Dec 10, 2020

@codyhoag FYI

Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

@miabbott just some minor wordsmithing suggestions from me. Would this also apply to OCP 4.4? Or is this only relevant in 4.5?

@miabbott
Copy link
Member Author

@miabbott just some minor wordsmithing suggestions from me. Would this also apply to OCP 4.4? Or is this only relevant in 4.5?

Thanks for the suggestion! This would be relevant to 4.4 as well

@codyhoag
Copy link
Contributor

@miabbott looks great! If you can squash your commits, I'll go ahead and merge.

Co-authored-by: Cody Hoag <choag@redhat.com>
@miabbott
Copy link
Member Author

Squashed + pushed ⬆️

@codyhoag codyhoag merged commit ebd1342 into openshift:enterprise-4.5 Dec 11, 2020
@openshift-ci-robot
Copy link

@miabbott: Bugzilla bug 1902584 is in an unrecognized state (CLOSED (CURRENTRELEASE)) and will not be moved to the MODIFIED state.

In response to this:

Bug 1902584: note workaround for advanced networking issues

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 Dec 11, 2020

/cherrypick enterprise-4.4

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 11, 2020

@codyhoag: #28036 failed to apply on top of branch "enterprise-4.4":

Applying: Bug 1902584: note workaround for advanced networking issues
Using index info to reconstruct a base tree...
M	modules/installation-user-infra-machines-static-network.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-user-infra-machines-static-network.adoc
CONFLICT (content): Merge conflict in modules/installation-user-infra-machines-static-network.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 Bug 1902584: note workaround for advanced networking issues
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.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.

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 bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants