merge mainline to this branch

zhonghui12 · Aug 10, 2020 · f11236d · f11236d
2 parents 67e81cf + 1ea50fe
commit f11236d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -4,8 +4,7 @@ go 1.12
 
 require (
 	github.com/aws/amazon-kinesis-firehose-for-fluent-bit v1.4.1
-	github.com/aws/aws-sdk-go v1.33.17
-	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
+	github.com/aws/aws-sdk-go v1.34.0
 	github.com/fluent/fluent-bit-go v0.0.0-20200707230002-2a28684e2382
 	github.com/golang/mock v1.4.3
 	github.com/golang/protobuf v1.4.2

diff --git a/go.sum b/go.sum
@@ -5,6 +5,8 @@ github.com/aws/amazon-kinesis-firehose-for-fluent-bit v1.4.1/go.mod h1:LV5vSM9R3
 github.com/aws/aws-sdk-go v1.33.13/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.33.17 h1:vngPRchZs603qLtJH7lh2pBCDqiFxA9+9nDWJ5WYJ5A=
 github.com/aws/aws-sdk-go v1.33.17/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/aws/aws-sdk-go v1.34.0 h1:brux2dRrlwCF5JhTL7MUT3WUwo9zfDHZZp3+g3Mvlmo=
+github.com/aws/aws-sdk-go v1.34.0/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=