From 5f500539147963eabb924e76aca88080eef4d442 Mon Sep 17 00:00:00 2001 From: Atin Malaviya Date: Wed, 24 Dec 2014 17:49:50 -0500 Subject: [PATCH 1/2] Modified to import github.com/hashicorp/go-multierror rather than terraform's multierror. --- hcl/parse.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hcl/parse.go b/hcl/parse.go index 7998674..21bd2a4 100644 --- a/hcl/parse.go +++ b/hcl/parse.go @@ -3,7 +3,7 @@ package hcl import ( "sync" - "github.com/hashicorp/terraform/helper/multierror" + "github.com/hashicorp/go-multierror" ) // hclErrors are the errors built up from parsing. These should not From 98bdeedb2ccd190874825674285ac13d28497862 Mon Sep 17 00:00:00 2001 From: Atin Malaviya Date: Wed, 24 Dec 2014 18:34:28 -0500 Subject: [PATCH 2/2] Missed one more go-multierror --- json/parse.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/parse.go b/json/parse.go index 3f304c4..9ab454a 100644 --- a/json/parse.go +++ b/json/parse.go @@ -4,7 +4,7 @@ import ( "sync" "github.com/hashicorp/hcl/hcl" - "github.com/hashicorp/terraform/helper/multierror" + "github.com/hashicorp/go-multierror" ) // jsonErrors are the errors built up from parsing. These should not