Cherry-pick commits from PR #1165 & #1182 into release-v1.7 #1185
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
|
Hi @mogren -- Cherry-picking changes from Thank you for your time and help with these PRs. |
mogren
approved these changes
Sep 1, 2020
|
@realgaurav We just merged 11 cherry picked commits over to the |
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.
Cherry-pick commits from PR #1165 & #1182 into release-v1.7
What type of PR is this?
cleanup (cherry-picking changes from master).
Which issue(s) this PR fixes:
What this PR does / why we need it:
Updating Calico version to
v3.15.1and fixing a Felix config.If issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
Testing:
Automation added to e2e:
Will this break upgrades and downgrades. Has it been tested?:
Does this require config only upgrades?:
Does this PR introduce a user-facing change?:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.