From 0e65660548c4430be71d45988129f26e45fa6892 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 26 Feb 2018 10:34:15 -0800 Subject: [PATCH] *: revert "internal/discovery" change Signed-off-by: Gyuho Lee --- {internal/discovery => discovery}/discovery.go | 0 {internal/discovery => discovery}/discovery_test.go | 0 etcdmain/etcd.go | 2 +- etcdserver/server.go | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {internal/discovery => discovery}/discovery.go (100%) rename {internal/discovery => discovery}/discovery_test.go (100%) diff --git a/internal/discovery/discovery.go b/discovery/discovery.go similarity index 100% rename from internal/discovery/discovery.go rename to discovery/discovery.go diff --git a/internal/discovery/discovery_test.go b/discovery/discovery_test.go similarity index 100% rename from internal/discovery/discovery_test.go rename to discovery/discovery_test.go diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index e5906f0be..409844923 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/internal/version" "github.com/coreos/etcd/pkg/cors" "github.com/coreos/etcd/pkg/fileutil" diff --git a/etcdserver/server.go b/etcdserver/server.go index 5c8478073..25e929445 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -31,13 +31,13 @@ import ( "github.com/coreos/etcd/alarm" "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/auth" - "github.com/coreos/etcd/internal/discovery" "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/lease/leasehttp" "github.com/coreos/etcd/internal/mvcc"