[release/1.2] backport bugfix: override image.Env with process.Env, rather than be contrary#3546
Merged
fuweid merged 2 commits intocontainerd:release/1.2from Aug 16, 2019
Merged
Conversation
Signed-off-by: Yangyang <[email protected]>
Signed-off-by: Andrey Kolomentsev <[email protected]> Signed-off-by: akolomentsev <[email protected]>
Codecov Report
@@ Coverage Diff @@
## release/1.2 #3546 +/- ##
==============================================
+ Coverage 43.66% 43.96% +0.3%
==============================================
Files 101 101
Lines 10816 10824 +8
==============================================
+ Hits 4723 4759 +36
+ Misses 5357 5326 -31
- Partials 736 739 +3
Continue to review full report at Codecov.
|
Member
|
LGTM |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Signed-off-by: Yangyang [email protected]
Signed-off-by: Andrey Kolomentsev [email protected]
Signed-off-by: Phil Estes [email protected]
includes backport of some test framework code due to cherry-pick conflicts around the env/image config test
Cherry-pick/backport of #3542
Backport of #2887