diff --git a/CHANGELOG.md b/CHANGELOG.md index 3454c5d499e..07103a103f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 1.26.0 +* Feature - Startup order can now be explicitly set via DependsOn field in the Task Definition [#1904](https://github.com/aws/amazon-ecs-agent/pull/1904) +* Feature - Containers in a task can now have individual start and stop timeouts [#1904](https://github.com/aws/amazon-ecs-agent/pull/1904) +* Feature - AWS App Mesh CNI plugin support [#1898](https://github.com/aws/amazon-ecs-agent/pull/1898) +* Enhancement - Containers with links and volumes defined will now shutdown in the correct order [#1904](https://github.com/aws/amazon-ecs-agent/pull/1904) +* Bug - Image cleanup errors fixed [#1897](https://github.com/aws/amazon-ecs-agent/pull/1897) + ## 1.25.3 * Bug - Fixed a bug where agent no longer redirected malformed credentials or metadata http requests [#1844](https://github.com/aws/amazon-ecs-agent/pull/1844) * Bug - Populate v3 metadata networks response for non-awsvpc tasks [#1833](https://github.com/aws/amazon-ecs-agent/pull/1833) diff --git a/README.md b/README.md index 8907339c9ec..800f1a693bf 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ ![Amazon ECS logo](doc/ecs.png "Amazon ECS") [![Build Status](https://travis-ci.org/aws/amazon-ecs-agent.svg?branch=master)](https://travis-ci.org/aws/amazon-ecs-agent) -[![Build status](https://ci.appveyor.com/api/projects/status/upkhbwf2oc0srglt?svg=true)](https://ci.appveyor.com/project/AmazonECS/amazon-ecs-agent) The Amazon ECS Container Agent is a component of Amazon Elastic Container Service diff --git a/VERSION b/VERSION index 5bb76b575e1..5ff8c4f5d2a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.25.3 +1.26.0 diff --git a/agent/version/version.go b/agent/version/version.go index 1c5096ba044..c615a874661 100644 --- a/agent/version/version.go +++ b/agent/version/version.go @@ -22,7 +22,7 @@ package version // repository. Only the 'Version' const should change in checked-in source code // Version is the version of the Agent -const Version = "1.25.3" +const Version = "1.26.0" // GitDirty indicates the cleanliness of the git repo when this agent was built const GitDirty = true