From c09737e825e44752e374801fc44b077a8ade2b07 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Thu, 25 Jan 2018 14:32:13 -0800 Subject: [PATCH] *: move "discovery" to "internal/discovery" Signed-off-by: Gyuho Lee --- etcdmain/etcd.go | 2 +- etcdserver/server.go | 2 +- {discovery => internal/discovery}/discovery.go | 0 {discovery => internal/discovery}/discovery_test.go | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {discovery => internal/discovery}/discovery.go (100%) rename {discovery => internal/discovery}/discovery_test.go (100%) diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index 87e9b25bb0ff..49ef725782f3 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -26,10 +26,10 @@ import ( "strings" "time" - "github.com/coreos/etcd/discovery" "github.com/coreos/etcd/embed" "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api/etcdhttp" + "github.com/coreos/etcd/internal/discovery" "github.com/coreos/etcd/pkg/cors" "github.com/coreos/etcd/pkg/fileutil" pkgioutil "github.com/coreos/etcd/pkg/ioutil" diff --git a/etcdserver/server.go b/etcdserver/server.go index 4bf6eded8e1d..1a6be8b7b6b8 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -32,12 +32,12 @@ import ( "github.com/coreos/etcd/alarm" "github.com/coreos/etcd/auth" "github.com/coreos/etcd/compactor" - "github.com/coreos/etcd/discovery" "github.com/coreos/etcd/etcdserver/api" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/etcdserver/stats" + "github.com/coreos/etcd/internal/discovery" "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/lease" "github.com/coreos/etcd/lease/leasehttp" diff --git a/discovery/discovery.go b/internal/discovery/discovery.go similarity index 100% rename from discovery/discovery.go rename to internal/discovery/discovery.go diff --git a/discovery/discovery_test.go b/internal/discovery/discovery_test.go similarity index 100% rename from discovery/discovery_test.go rename to internal/discovery/discovery_test.go