Merge branch 'release-1.20.0' into mainline

bvtujo · bvtujo · commit 7547c455cfd3 · 2020-07-07T15:09:30.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.20.0
+* Feature - Add support for EFS in `compose up` ECS Task workflow (#1076)
+* Enhancement (BREAKING CHANGE) - Downgrade the error generated when setting 
+  `--enable-service-discovery` on an existing service to a warning (#1071)
+
 ## 1.19.1
 * Bug - Don't set platform version for EC2 services (#1041)
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.19.1
+1.20.0
diff --git a/ecs-cli/modules/version/version.go b/ecs-cli/modules/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 ECS CLI
-const Version = "1.19.1"
+const Version = "1.20.0"
 
 // GitDirty indicates the cleanliness of the git repo when this ecs-cli was built
 const GitDirty = true
