Merge branch 'dev' into boltdb #2553
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
Merging from dev
…data, and OverrideAWSLogsExecutionRole to BooleanDeafultFalse
Update: Support for sub second precision in FluentD Docker Log Driver.
Merge branch 'dev' into boolean_config_fix
Merge branch 'boolean_config_fix' into dev
ubhattacharjya
approved these changes
Aug 3, 2020
yhlee-aws
approved these changes
Aug 4, 2020
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
Merge branch 'dev' into boltdb. Needed for functional test to pass in boltdb branch.
Implementation details
A few conflicts related to boolean config migration. Resolved by using changes in dev branch.
Testing
New tests cover the changes: no
Description for the changelog
N/A
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.