Merge branch 'v1.36.0-stage' into dev

aws · Jan 13, 2020 · 45e3723 · 45e3723
2 parents 4b33e1f + 6cacbce
commit 45e3723
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,5 +1,8 @@
 # Changelog
 
+## 1.36.0
+* Feature - structured logs and logfile rollover features [#2311](https://github.com/aws/amazon-ecs-agent/pull/2311), [#2319](https://github.com/aws/amazon-ecs-agent/pull/2319), [#2330](https://github.com/aws/amazon-ecs-agent/pull/2330)
+
 ## 1.35.0
 * Feature - EFS Preview [#2301](https://github.com/aws/amazon-ecs-agent/pull/2301)
 * Bug - Load pause container for use by PID/IPC even if task networking is disabled [#2300](https://github.com/aws/amazon-ecs-agent/pull/2300)

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