Merge pull request #218 from jordanjean/proxy-support

Norman Proxy Support
rancher · Mar 20, 2020 · 6d9d78b · 6d9d78b
2 parents 5b1a20d + beaa3e3
commit 6d9d78b
Show file tree

Hide file tree

Showing 217 changed files with 45,238 additions and 43,175 deletions.
diff --git a/go.mod b/go.mod
@@ -3,10 +3,9 @@ module github.com/terraform-providers/terraform-provider-rancher2
 go 1.12
 
 require (
-	github.com/google/btree v1.0.0 // indirect
 	github.com/hashicorp/go-version v1.2.0
 	github.com/hashicorp/terraform-plugin-sdk v1.7.0
-	github.com/rancher/norman v0.0.0-20191126011629-6269ccdbeace
+	github.com/rancher/norman v0.0.0-20200206042542-ef3920abad1c
 	github.com/rancher/types v0.0.0-20191126013101-de3dc217d60f
 	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
 )

diff --git a/go.sum b/go.sum
diff --git a/vendor/github.com/apparentlymart/go-textseg/textseg/make_tables.go b/vendor/github.com/apparentlymart/go-textseg/textseg/make_tables.go