Consul test server fork without porter/rpc.ports

hashicorp · Oct 17, 2017 · 756737a · 756737a
1 parent 1e9c417
commit 756737a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 21 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -150,7 +150,8 @@ deps: ## Install build and development dependencies
 	go get -u github.com/elazarl/go-bindata-assetfs/...
 	go get -u github.com/hashicorp/vault
 	go get -u github.com/a8m/tree/cmd/tree
-	go get -u github.com/hashicorp/consul/test/porter/cmd/porter
+	## Unneeded since we use Consul's no-porter branch
+	##go get -u github.com/hashicorp/consul/test/porter/cmd/porter
 
 .PHONY: check
 check: ## Lint the source code

diff --git a/vendor/github.com/hashicorp/consul/testutil/server.go b/vendor/github.com/hashicorp/consul/testutil/server.go
diff --git a/vendor/github.com/hashicorp/consul/testutil/server_methods.go b/vendor/github.com/hashicorp/consul/testutil/server_methods.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -767,16 +767,16 @@
 			"revisionTime": "2017-10-16T16:22:40Z"
 		},
 		{
-			"checksumSHA1": "srD5fzGnxoAqvR6oIE4JBJ1OuT8=",
+			"checksumSHA1": "AZh3opzONxPrOi+4Io2+OomdKgM=",
 			"path": "github.com/hashicorp/consul/testutil",
-			"revision": "51ea240df8476e02215d53fbfad5838bf0d44d21",
-			"revisionTime": "2017-10-16T16:22:40Z"
+			"revision": "745fd38728f28061c9f5bfe323d68ee25f2cd07b",
+			"revisionTime": "2017-10-16T23:19:35Z"
 		},
 		{
 			"checksumSHA1": "J8TTDc84MvAyXE/FrfgS+xc/b6s=",
 			"path": "github.com/hashicorp/consul/testutil/retry",
-			"revision": "51ea240df8476e02215d53fbfad5838bf0d44d21",
-			"revisionTime": "2017-10-16T16:22:40Z"
+			"revision": "745fd38728f28061c9f5bfe323d68ee25f2cd07b",
+			"revisionTime": "2017-10-16T23:19:35Z"
 		},
 		{
 			"path": "github.com/hashicorp/errwrap",