Rebased windows-prefix-delegation branch onto master branch #228
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…not specified in ENIConfig (aws#221) * Associate primary network interface SG with the trunk ENI when SG is not specified in ENIConfig
haouc
reviewed
May 26, 2023
haouc
reviewed
May 26, 2023
haouc
previously approved these changes
May 27, 2023
|
Looks like still complaining about conflicts. @jiechen0826 can you check regarding the conflicting files list? Thanks |
Hi Hao, thank you for reviewing this gigantic PR. Apologies for the inconvenience. I fixed the merge conflict. Just FYI, the build won't succeed since prefix provider is still missing healthz check. |
haouc
approved these changes
May 29, 2023
There was a problem hiding this comment.
@jiechen0826 thanks for fixing the merge conflicts. Looks good to me.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.