Merge pull request #1965 from aws/master

Merging 1.26.1 release back to dev
aws · Mar 28, 2019 · 88a709c · 88a709c
2 parents 28c5607 + 24c7116
commit 88a709c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## 1.26.1
+* Enhancement - Set up pause container user the same as proxy container when App Mesh enabled and pause container not using default image
+* Bug - Fixed a bug where network stats are not presented in container stats [#1932](https://github.com/aws/amazon-ecs-agent/pull/1932)
 
 ## 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)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.26.0
+1.26.1
diff --git 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.26.0"
+const Version = "1.26.1"
 
 // GitDirty indicates the cleanliness of the git repo when this agent was built
 const GitDirty = true