Merge pull request #4108 from hashicorp/vendor-go-discover

Update go-discover and add triton provider
hashicorp · May 11, 2018 · 876d251 · 876d251
2 parents 281e666 + 4856084
commit 876d251
Show file tree

Hide file tree

Showing 172 changed files with 38,313 additions and 7,533 deletions.
diff --git a/agent/retry_join_test.go b/agent/retry_join_test.go
@@ -10,7 +10,7 @@ import (
 func TestGoDiscoverRegistration(t *testing.T) {
 	d := discover.Discover{}
 	got := d.Names()
-	want := []string{"aliyun", "aws", "azure", "digitalocean", "gce", "os", "scaleway", "softlayer"}
+	want := []string{"aliyun", "aws", "azure", "digitalocean", "gce", "os", "scaleway", "softlayer", "triton"}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("got go-discover providers %v want %v", got, want)
 	}

diff --git a/vendor/cloud.google.com/go/LICENSE b/vendor/cloud.google.com/go/LICENSE