From 6bbe1072250b397732c76918a098251adf8573f7 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 26 Feb 2018 10:32:24 -0800 Subject: [PATCH] *: revert "internal/compactor" package change Signed-off-by: Gyuho Lee --- {internal/compactor => compactor}/compactor.go | 0 {internal/compactor => compactor}/compactor_test.go | 0 {internal/compactor => compactor}/doc.go | 0 {internal/compactor => compactor}/periodic.go | 0 {internal/compactor => compactor}/periodic_test.go | 0 {internal/compactor => compactor}/revision.go | 0 {internal/compactor => compactor}/revision_test.go | 0 embed/config.go | 2 +- etcdserver/server.go | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename {internal/compactor => compactor}/compactor.go (100%) rename {internal/compactor => compactor}/compactor_test.go (100%) rename {internal/compactor => compactor}/doc.go (100%) rename {internal/compactor => compactor}/periodic.go (100%) rename {internal/compactor => compactor}/periodic_test.go (100%) rename {internal/compactor => compactor}/revision.go (100%) rename {internal/compactor => compactor}/revision_test.go (100%) diff --git a/internal/compactor/compactor.go b/compactor/compactor.go similarity index 100% rename from internal/compactor/compactor.go rename to compactor/compactor.go diff --git a/internal/compactor/compactor_test.go b/compactor/compactor_test.go similarity index 100% rename from internal/compactor/compactor_test.go rename to compactor/compactor_test.go diff --git a/internal/compactor/doc.go b/compactor/doc.go similarity index 100% rename from internal/compactor/doc.go rename to compactor/doc.go diff --git a/internal/compactor/periodic.go b/compactor/periodic.go similarity index 100% rename from internal/compactor/periodic.go rename to compactor/periodic.go diff --git a/internal/compactor/periodic_test.go b/compactor/periodic_test.go similarity index 100% rename from internal/compactor/periodic_test.go rename to compactor/periodic_test.go diff --git a/internal/compactor/revision.go b/compactor/revision.go similarity index 100% rename from internal/compactor/revision.go rename to compactor/revision.go diff --git a/internal/compactor/revision_test.go b/compactor/revision_test.go similarity index 100% rename from internal/compactor/revision_test.go rename to compactor/revision_test.go diff --git a/embed/config.go b/embed/config.go index 7204130bb..a639df5bb 100644 --- a/embed/config.go +++ b/embed/config.go @@ -26,8 +26,8 @@ import ( "strings" "time" + "github.com/coreos/etcd/compactor" "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/internal/compactor" "github.com/coreos/etcd/pkg/cors" "github.com/coreos/etcd/pkg/netutil" "github.com/coreos/etcd/pkg/srv" diff --git a/etcdserver/server.go b/etcdserver/server.go index 79d174258..c0505edb8 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -29,6 +29,7 @@ import ( "sync/atomic" "time" + "github.com/coreos/etcd/compactor" "github.com/coreos/etcd/etcdserver/api" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" @@ -36,7 +37,6 @@ import ( "github.com/coreos/etcd/etcdserver/stats" "github.com/coreos/etcd/internal/alarm" "github.com/coreos/etcd/internal/auth" - "github.com/coreos/etcd/internal/compactor" "github.com/coreos/etcd/internal/discovery" "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/lease/leasehttp"