From 55a2a13e5543f643f64a2c2e611f17753bbb1365 Mon Sep 17 00:00:00 2001
From: Justin Haynes <jushay@amazon.com>
Date: Tue, 17 Oct 2017 14:50:41 +0000
Subject: [PATCH] update agent to 1.15.0.

---
 CHANGELOG.md                      | 14 ++++++++------
 VERSION                           |  2 +-
 agent/version/version.go          |  2 +-
 misc/windows-deploy/user-data.ps1 |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab633c4997c..589a24db8c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,16 @@
 # Changelog
 
-## UNRELEASED
+## 1.15.0
 * Feature - Support for provisioning Tasks with ENIs
-* Enhancement - Support `init` process in containers by adding support for Docker remote API client version 1.25
-  [#996](https://github.com/aws/amazon-ecs-agent/pull/996)
+* Feature - Support for `--init` Docker run flag
+* Feature - Introduces container level metadata  [#981](https://github.com/aws/amazon-ecs-agent/pull/981)
 * Enhancement - Enable 'none' logging driver capability by default 
   [#1041](https://github.com/aws/amazon-ecs-agent/pull/1041) 
-* Bug - Fixed a bug where tasks that fail to pull containers can cause the
-  agent to fail to restore properly after a restart.
-  [#1033](https://github.com/aws/amazon-ecs-agent/pull/1033)
+* Enhancement - Support `init` process in containers by adding support for Docker remote API client version 1.25
+  [#996](https://github.com/aws/amazon-ecs-agent/pull/996)
+* Bug - Fixed a bug where tasks that fail to pull containers can cause the agent
+  to fail to restore properly after a restart. [#1033](https://github.com/aws/amazon-ecs-agent/pull/1033)
+* Bug - Fixed default logging level issue [#1016](https://github.com/aws/amazon-ecs-agent/pull/1016)
 * Bug - Fixed a bug where unsupported Docker API client versions could be registered
   [#1014](https://github.com/aws/amazon-ecs-agent/pull/1014)
 * Bug - Fixed a bug where non-essential container state changes were sometimes not submitted
diff --git a/VERSION b/VERSION
index 61e44cc77cf..d19d0890128 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.14.5
\ No newline at end of file
+1.15.0
\ No newline at end of file
diff --git a/agent/version/version.go b/agent/version/version.go
index a4d2d718cde..fc1948fd852 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.14.5"
+const Version = "1.15.0"
 
 // GitDirty indicates the cleanliness of the git repo when this agent was built
 const GitDirty = true
diff --git a/misc/windows-deploy/user-data.ps1 b/misc/windows-deploy/user-data.ps1
index e98fd7329e8..564871c5952 100644
--- a/misc/windows-deploy/user-data.ps1
+++ b/misc/windows-deploy/user-data.ps1
@@ -4,7 +4,7 @@
 # Set agent env variables for the Machine context (durable)
 [Environment]::SetEnvironmentVariable("ECS_CLUSTER", "windows", "Machine")
 [Environment]::SetEnvironmentVariable("ECS_ENABLE_TASK_IAM_ROLE", "false", "Machine")
-$agentVersion = 'v1.14.5'
+$agentVersion = 'v1.15.0'
 $agentZipUri = "https://s3.amazonaws.com/amazon-ecs-agent/ecs-agent-windows-$agentVersion.zip"
 $agentZipMD5Uri = "$agentZipUri.md5"