Merge branch 'v1.36.2-stage' into dev

aws · Feb 11, 2020 · ee53fdb · ee53fdb
2 parents d232a51 + 0e4174f
commit ee53fdb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.36.2
+* Bug - fix windows logfile writing [#2347](https://github.com/aws/amazon-ecs-agent/pull/2347)
+* Bug - update sbin mount point to avoid conflict with Docker >= 19.03.5 [#2345](https://github.com/aws/amazon-ecs-agent/pull/2345)
+
 ## 1.36.1
 * Bug - Fixed potential file descriptor leak with context logger [#2337](https://github.com/aws/amazon-ecs-agent/pull/2337)
 

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