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

This commit is contained in:
Ryan Breen 2015-02-24 14:12:02 -05:00
commit c7f4fb5d78
1 changed files with 0 additions and 16 deletions

View File

@ -16,22 +16,6 @@ import (
"github.com/hashicorp/consul/testutil" "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 { type testServer struct {
pid int pid int
dataDir string dataDir string