Merge branch 'ipv6' into dev #2646
Merged
+389
−187
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.
Summary
Merge ipv6 feature branch to dev.
Implementation details
Merge branch:
git merge
no merge conflict;Also update ecs-cni submodule switch from dev to master branch since changes have been merged to master (c35f0b4). Done by running
git submodule update --init --recursive --remote
and update commit sha used by unit test.Testing
Rely on existing tests added in feature branch.
Description for the changelog
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.