Merge branch 'master' of github.com:hashicorp/consul into GH-730

10 years ago · c7f4fb5d78
parent b9e72887e9 33390779eb
commit c7f4fb5d78
1 changed files with 0 additions and 16 deletions
--- a/api/api_test.go
+++ b/api/api_test.go
@ -16,22 +16,6 @@ import (
 	"github.com/hashicorp/consul/testutil"
 )
 var consulConfig = `{
 	"ports": {
 		"dns": 19000,
 		"http": 18800,
 		"rpc": 18600,
 		"serf_lan": 18200,
 		"serf_wan": 18400,
 		"server": 18000
 	},
 	"bind_addr": "127.0.0.1",
 	"data_dir": "%s",
 	"bootstrap": true,
 	"log_level": "debug",
 	"server": true
 }`
 type testServer struct {
 	pid        int
 	dataDir    string