From 663e6f3ec056dfcd94e77d8cf74ef41d1be68fd8 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Thu, 11 May 2017 17:11:35 +0100 Subject: [PATCH] vendor: patch github.com/aws/aws-sdk-go to fix the build Temporary until https://github.com/aws/aws-sdk-go/pull/1262 is merged. --- .../aws/aws-sdk-go/aws/request/connection_reset_error.go | 2 +- ...reset_error_appengine.go => connection_reset_error_other.go} | 2 +- ...r_appengine_test.go => connection_reset_error_other_test.go} | 2 +- .../aws/aws-sdk-go/aws/request/connection_reset_error_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename vendor/github.com/aws/aws-sdk-go/aws/request/{connection_reset_error_appengine.go => connection_reset_error_other.go} (84%) rename vendor/github.com/aws/aws-sdk-go/aws/request/{connection_reset_error_appengine_test.go => connection_reset_error_other_test.go} (80%) diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error.go b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error.go index 10fc8cb24..271da432c 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error.go @@ -1,4 +1,4 @@ -// +build !appengine +// +build !appengine,!plan9 package request diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_appengine.go b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go similarity index 84% rename from vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_appengine.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go index 996196e73..daf9eca43 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_appengine.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go @@ -1,4 +1,4 @@ -// +build appengine +// +build appengine plan9 package request diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_appengine_test.go b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other_test.go similarity index 80% rename from vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_appengine_test.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other_test.go index 29660da23..aba8eb4e8 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_appengine_test.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other_test.go @@ -1,4 +1,4 @@ -// +build appengine +// +build appengine plan9 package request_test diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_test.go b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_test.go index f02c507d5..bb5f6bddc 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_test.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_test.go @@ -1,4 +1,4 @@ -// +build !appengine +// +build !appengine,!plan9 package request_test