Browse Source

*: revert "internal/discovery" change

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
commit
0e65660548
4 changed files with 2 additions and 2 deletions
  1. 0 0
      discovery/discovery.go
  2. 0 0
      discovery/discovery_test.go
  3. 1 1
      etcdmain/etcd.go
  4. 1 1
      etcdserver/server.go

+ 0 - 0
internal/discovery/discovery.go → discovery/discovery.go


+ 0 - 0
internal/discovery/discovery_test.go → discovery/discovery_test.go


+ 1 - 1
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"

+ 1 - 1
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"