Merge changes for 1.15.1 from the v1.15.x branch to dev #1072
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
jhaynes
reviewed
Nov 13, 2017
| @@ -3,6 +3,7 @@ | |||
| ## Unreleased | |||
| * Feature - Support pulling from Amazon ECR with specified IAM role in task definition | |||
| * Feature - Enable support for task level CPU and memory constraints. | |||
| * Bug - Fixed a bug where container state information wasn't reported. [#1067](https://github.com/aws/amazon-ecs-agent/pull/1067) | |||
There was a problem hiding this comment.
Should all three of these bug fixes be in the ## 1.15.1 header for this merge as well?
There was a problem hiding this comment.
Dev already has the other fixes and their corresponding changelog. The merge just pulls in the one entry that was missing.
|
We may want to skip this merge and wait to merge all the 1.15.2 changes when they're ready. I don't see a need to merge this PR as is. Any disagreement? |
|
Seems reasonable to me. |
|
yes, this was included in 1.15.2, we can just merge 1.15.2 to dev. |
|
We merged all the 1.15.x changes up to and including 1.15.2 in #1082. We don't need this PR. |
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
This PR ensures that changes that have already been staged for release as 1.15.1 are reflected in the dev branch for future feature releases.
In reality, this only pull in the addition of a unit test and a changelog update.
Implementation details
git checkout dev
git merge v1.15.x
There were merge conflicts because there was a minimal change in 1.15.x to address #1067 while the same issue was fixed as part of a larger refactor in the dev branch. The conflict was resolved by keeping the fix from the dev branch.
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
CHANGELOG.md updates are included here as appropriate.
Licensing
This contribution is under the terms of the Apache 2.0 License: yes