Merge #3336: Remove local multierror package.

Instead, use ``github.com/hashicorp/go-multierror``.
hashicorp · Oct 4, 2015 · 3fde993 · 3fde993
2 parents c3a6c05 + 2ba8dc3
commit 3fde993
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 114 deletions.
diff --git a/builtin/providers/aws/config.go b/builtin/providers/aws/config.go
@@ -5,7 +5,7 @@ import (
  "log"
  "strings"
 
- "github.com/hashicorp/terraform/helper/multierror"
+ "github.com/hashicorp/go-multierror"
 
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/awserr"

diff --git a/builtin/providers/aws/resource_aws_db_security_group.go b/builtin/providers/aws/resource_aws_db_security_group.go
@@ -9,8 +9,8 @@ import (
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/awserr"
  "github.com/aws/aws-sdk-go/service/rds"
+ "github.com/hashicorp/go-multierror"
  "github.com/hashicorp/terraform/helper/hashcode"
- "github.com/hashicorp/terraform/helper/multierror"
  "github.com/hashicorp/terraform/helper/resource"
  "github.com/hashicorp/terraform/helper/schema"
 )

diff --git a/builtin/providers/heroku/resource_heroku_app.go b/builtin/providers/heroku/resource_heroku_app.go
@@ -5,7 +5,7 @@ import (
  "log"
 
  "github.com/cyberdelia/heroku-go/v3"
- "github.com/hashicorp/terraform/helper/multierror"
+ "github.com/hashicorp/go-multierror"
  "github.com/hashicorp/terraform/helper/schema"
 )
 

diff --git a/config/config.go b/config/config.go
@@ -8,10 +8,10 @@ import (
  "strconv"
  "strings"
 
+ "github.com/hashicorp/go-multierror"
  "github.com/hashicorp/terraform/config/lang"
  "github.com/hashicorp/terraform/config/lang/ast"
  "github.com/hashicorp/terraform/flatmap"
- "github.com/hashicorp/terraform/helper/multierror"
  "github.com/mitchellh/mapstructure"
  "github.com/mitchellh/reflectwalk"
 )

diff --git a/helper/multierror/error.go b/helper/multierror/error.go
diff --git a/helper/multierror/error_test.go b/helper/multierror/error_test.go