Merging Moby with Latest Dev into AgentMetrics #1742
Merged
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
Go may warn (exit non-zero) in some cases because it interprets the `^// +build` string fragment as a pragma. By moving this to the beginning of the string, we can avoid the issue entirely.
Merge master back to dev
Merge ecs-secrets-phase2 branch to dev
Update docker container versions, remove -race flag Functional test changes HTTPD docker container version fix Fluentd test fix Registry image update Skip fluetd test for Arm Fix registry container image Fixing exit authed test Adding runtime library Registry image fix Fluentd fluentd Testing registry Testing registry Test Test Testing registry Test pass Skip fluentd test
Merge branch 'dev' into moby
yhlee-aws
approved these changes
Dec 13, 2018
yumex93
approved these changes
Dec 13, 2018
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.
Summary
git rebase aws-ecs/moby
Testing
make release)go build -out amazon-ecs-agent.exe ./agent)make test) passgo test -timeout=25s ./agent/...) passmake run-integ-tests) pass.\scripts\run-integ-tests.ps1) passmake run-functional-tests) pass.\scripts\run-functional-tests.ps1) passNew tests cover the changes:
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.