From 23d4b247920ca4f9ba013431c16a9ece29ab7cac Mon Sep 17 00:00:00 2001 From: James Phillips Date: Sat, 21 Oct 2017 20:08:11 -0700 Subject: [PATCH] Cleans up import sorting. --- agent/watch_handler.go | 4 ++-- agent/watch_handler_test.go | 3 ++- watch/watch.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/agent/watch_handler.go b/agent/watch_handler.go index c7b4370a97..dc94a7219a 100644 --- a/agent/watch_handler.go +++ b/agent/watch_handler.go @@ -2,20 +2,20 @@ package agent import ( "bytes" + "crypto/tls" "encoding/json" "fmt" "io" "log" + "net/http" "os" "os/exec" "strconv" - "crypto/tls" "github.com/armon/circbuf" "github.com/hashicorp/consul/watch" "github.com/hashicorp/go-cleanhttp" "golang.org/x/net/context" - "net/http" ) const ( diff --git a/agent/watch_handler_test.go b/agent/watch_handler_test.go index a21a1769e3..ca98e17a9b 100644 --- a/agent/watch_handler_test.go +++ b/agent/watch_handler_test.go @@ -1,13 +1,14 @@ package agent import ( - "github.com/hashicorp/consul/watch" "io/ioutil" "net/http" "net/http/httptest" "os" "testing" "time" + + "github.com/hashicorp/consul/watch" ) func TestMakeWatchHandler(t *testing.T) { diff --git a/watch/watch.go b/watch/watch.go index e5004f2ea1..cdf5342960 100644 --- a/watch/watch.go +++ b/watch/watch.go @@ -5,10 +5,10 @@ import ( "fmt" "io" "sync" + "time" consulapi "github.com/hashicorp/consul/api" "github.com/mitchellh/mapstructure" - "time" ) const DefaultTimeout = 10 * time.Second