Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into centos
Browse files Browse the repository at this point in the history
  • Loading branch information
psiniemi committed Oct 2, 2019
2 parents 2666878 + 22789aa commit 8fbc9dd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ecs-init/ECSVERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.31.0
1.32.0
2 changes: 1 addition & 1 deletion ecs-init/config/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,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.31.0"
DefaultAgentVersion = "v1.32.0"

// AgentPartitionBucketName is the name of the paritional s3 bucket that stores the agent
AgentPartitionBucketName = "amazon-ecs-agent"
Expand Down
5 changes: 4 additions & 1 deletion packaging/amazon-linux-ami/ecs-init.spec
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
%endif

Name: ecs-init
Version: 1.31.0
Version: 1.32.0
Release: 1%{?dist}
License: Apache 2.0
Summary: Amazon Elastic Container Service initialization application
Expand Down Expand Up @@ -254,6 +254,9 @@ fi
%endif

%changelog
* Wed Sep 25 2019 Cameron Sparr <[email protected]> - 1.32.0-1
- Cache Agent version 1.32.0

* Thu Sep 13 2019 Yajie Chu <[email protected]> - 1.31.0-1
- Cache Agent version 1.31.0

Expand Down
6 changes: 6 additions & 0 deletions packaging/ubuntu-trusty/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
amazon-ecs-init (1.32.0-1) trusty; urgency=medium

* Cache Agent version 1.32.0

-- Cameron Sparr <[email protected]> Wed, 25 Sep 2019 10:00:00 -0800

amazon-ecs-init (1.31.0-1) trusty; urgency=medium

* Cache Agent version 1.31.0
Expand Down

0 comments on commit 8fbc9dd

Please sign in to comment.