This commit is contained in:
Jeff Mitchell
2019-07-24 12:41:28 -04:00
parent fb8ce19d90
commit 6ad21c6812
2 changed files with 9 additions and 8 deletions

View File

@@ -87,13 +87,13 @@ type ServerCommand struct {
reloadedCh chan (struct{}) // for tests reloadedCh chan (struct{}) // for tests
// new stuff // new stuff
flagConfigs []string flagConfigs []string
flagLogLevel string flagLogLevel string
flagLogFormat string flagLogFormat string
flagDev bool flagDev bool
flagDevRootTokenID string flagDevRootTokenID string
flagDevListenAddr string flagDevListenAddr string
flagDevNoStoreToken bool flagDevNoStoreToken bool
flagDevPluginDir string flagDevPluginDir string
flagDevPluginInit bool flagDevPluginInit bool
flagDevHA bool flagDevHA bool

View File

@@ -5,7 +5,6 @@ import (
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt" "fmt"
"github.com/hashicorp/go-uuid"
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"net/http" "net/http"
@@ -17,6 +16,8 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/go-hclog" "github.com/hashicorp/go-hclog"
"github.com/hashicorp/vault/physical/raft" "github.com/hashicorp/vault/physical/raft"
"github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/sdk/helper/logging"