Merge branch 'v1.61.0-1-stage' into dev

aws · Apr 8, 2022 · e709037 · e709037
2 parents 8d924a5 + 295370c
commit e709037
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.61.0-1
+* Cache Agent version 1.61.0
+* Check ipv4 routes for default network interface instead of defaulting to eth0
+
 ## 1.60.1-1
 * Cache Agent version 1.60.1
 

diff --git a/ecs-init/ECSVERSION b/ecs-init/ECSVERSION
@@ -1 +1 @@
-1.60.1
+1.61.0
diff --git a/ecs-init/config/common.go b/ecs-init/config/common.go
@@ -46,7 +46,7 @@ const (
 	// DefaultAgentVersion is the version of the agent that will be
 	// fetched if required. This should look like v1.2.3 or an
 	// 8-character sha, as is downloadable from S3.
-	DefaultAgentVersion = "v1.60.1"
+	DefaultAgentVersion = "v1.61.0"
 
 	// AgentPartitionBucketName is the name of the paritional s3 bucket that stores the agent
 	AgentPartitionBucketName = "amazon-ecs-agent"

diff --git a/packaging/amazon-linux-ami/ecs-init.spec b/packaging/amazon-linux-ami/ecs-init.spec
@@ -33,7 +33,7 @@
 %endif
 
 Name:           ecs-init
-Version:        1.60.1
+Version:        1.61.0
 Release:        1%{?dist}
 License:        Apache 2.0
 Summary:        Amazon Elastic Container Service initialization application
@@ -279,6 +279,10 @@ fi
 %endif
 
 %changelog
+* Tue Apr 05 2022 Cameron Sparr <[email protected]> - 1.61.0-1
+- Cache Agent version 1.61.0
+- Check ipv4 routes for default network interface instead of defaulting to eth0
+
 * Wed Mar 23 2022 Ray Allan <[email protected]> - 1.60.1-1
 - Cache Agent version 1.60.1
 

diff --git a/packaging/generic-deb/debian/changelog b/packaging/generic-deb/debian/changelog
@@ -1,3 +1,10 @@
+amazon-ecs-init (1.61.0-1) stable; urgency=medium
+
+  * Cache Agent version 1.61.0
+  * Check ipv4 routes for default network interface instead of defaulting to eth0
+
+ -- Cameron Sparr <[email protected]>  Tue, 05 Apr 2022 18:00:00 +0000
+
 amazon-ecs-init (1.60.1-1) stable; urgency=medium
 
   * Cache Agent version 1.60.1

diff --git a/packaging/generic-rpm/amazon-ecs-init.spec b/packaging/generic-rpm/amazon-ecs-init.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           amazon-ecs-init
-Version:        1.60.1
+Version:        1.61.0
 Release:        1
 License:        Apache 2.0
 Summary:        Amazon Elastic Container Service initialization application
@@ -105,6 +105,10 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar
 %systemd_postun_with_restart amazon-ecs-volume-plugin
 
 %changelog
+* Tue Apr 05 2022 Cameron Sparr <[email protected]> - 1.61.0-1
+- Cache Agent version 1.61.0
+- Check ipv4 routes for default network interface instead of defaulting to eth0
+
 * Wed Mar 23 2022 Ray Allan <[email protected]> - 1.60.1-1
 - Cache Agent version 1.60.1
 

diff --git a/packaging/suse/amazon-ecs-init.changes b/packaging/suse/amazon-ecs-init.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Apr 05, 18:00:00 UTC 2022 - [email protected] - 1.61.0-1
+
+- Cache Agent version 1.61.0
+- Check ipv4 routes for default network interface instead of defaulting to eth0
+-------------------------------------------------------------------
 Wed Mar 23, 18:00:00 UTC 2022 - [email protected] - 1.60.1-1
 
 - Cache Agent version 1.60.1

diff --git a/scripts/changelog/CHANGELOG_MASTER b/scripts/changelog/CHANGELOG_MASTER
@@ -1,3 +1,9 @@
+1.61.0-1
+Cameron Sparr <[email protected]>
+2022-04-05T10:00:00-08:00
+Cache Agent version 1.61.0
+Check ipv4 routes for default network interface instead of defaulting to eth0
+
 1.60.1-1
 Ray Allan <[email protected]>
 2022-03-23T10:00:00-08:00