Merge pull request #764 from MattiasGees/automated-cherry-pick-of-#76…

…3-upstream-release-0.6 Automated cherry pick of #763
jetstack · Mar 13, 2019 · 3544951 · 3544951
2 parents 4b1cd9a + 863bfe7
commit 3544951
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -103,7 +103,8 @@ required = [
 
 [[constraint]]
   name = "github.com/hashicorp/terraform"
-  version = "0.11.11"
+  branch = "v0.11.11-ignore-changes"
+  source = "https://github.com/MattiasGees/terraform.git"
 
 [[override]]
   name = "github.com/hashicorp/go-tfe"

diff --git a/vendor/github.com/hashicorp/terraform/terraform/eval_diff.go b/vendor/github.com/hashicorp/terraform/terraform/eval_diff.go