*: move "lease" to "internal/lease"

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
release-3.4
Gyuho Lee 2018-01-26 11:09:29 -08:00
parent 880835c02c
commit 349a377a67
36 changed files with 34 additions and 36 deletions

View File

@ -26,7 +26,7 @@ import (
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
"github.com/coreos/etcd/integration" "github.com/coreos/etcd/integration"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/testutil"

View File

@ -20,7 +20,7 @@ import (
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api" "github.com/coreos/etcd/etcdserver/api"
"github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/internal/lease/leasehttp"
"github.com/coreos/etcd/rafthttp" "github.com/coreos/etcd/rafthttp"
) )

View File

@ -21,7 +21,7 @@ import (
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
) )
type LeaseServer struct { type LeaseServer struct {

View File

@ -22,7 +22,7 @@ import (
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
"github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

View File

@ -22,7 +22,7 @@ import (
"github.com/coreos/etcd/auth" "github.com/coreos/etcd/auth"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"

View File

@ -19,7 +19,7 @@ import (
"github.com/coreos/etcd/auth" "github.com/coreos/etcd/auth"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
) )

View File

@ -19,8 +19,8 @@ import (
"os" "os"
"time" "time"
"github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/raftsnap"
"github.com/coreos/etcd/lease"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/raft/raftpb"

View File

@ -38,10 +38,10 @@ import (
"github.com/coreos/etcd/internal/alarm" "github.com/coreos/etcd/internal/alarm"
"github.com/coreos/etcd/internal/compactor" "github.com/coreos/etcd/internal/compactor"
"github.com/coreos/etcd/internal/discovery" "github.com/coreos/etcd/internal/discovery"
"github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/internal/lease/leasehttp"
"github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/raftsnap"
"github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/internal/store"
"github.com/coreos/etcd/lease"
"github.com/coreos/etcd/lease/leasehttp"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/fileutil"

View File

@ -28,9 +28,9 @@ import (
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/raftsnap"
"github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/internal/store"
"github.com/coreos/etcd/lease"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/fileutil"

View File

@ -23,8 +23,8 @@ import (
"github.com/coreos/etcd/auth" "github.com/coreos/etcd/auth"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/lease/leasehttp" "github.com/coreos/etcd/internal/lease/leasehttp"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft"

View File

@ -24,8 +24,8 @@ import (
"time" "time"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/lease/leasepb" "github.com/coreos/etcd/internal/lease/leasepb"
"github.com/coreos/etcd/pkg/httputil" "github.com/coreos/etcd/pkg/httputil"
) )

View File

@ -23,7 +23,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
) )

View File

@ -22,7 +22,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/coreos/etcd/lease/leasepb" "github.com/coreos/etcd/internal/lease/leasepb"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
) )

View File

@ -15,7 +15,7 @@
package mvcc package mvcc
import ( import (
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"
) )

View File

@ -21,7 +21,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"
"github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/testutil"

View File

@ -14,9 +14,7 @@
package mvcc package mvcc
import ( import "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/lease"
)
type readView struct{ kv KV } type readView struct{ kv KV }

View File

@ -24,7 +24,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"
"github.com/coreos/etcd/pkg/schedule" "github.com/coreos/etcd/pkg/schedule"

View File

@ -18,7 +18,7 @@ import (
"sync/atomic" "sync/atomic"
"testing" "testing"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
) )

View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
) )

View File

@ -26,7 +26,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"
"github.com/coreos/etcd/pkg/schedule" "github.com/coreos/etcd/pkg/schedule"

View File

@ -15,7 +15,7 @@
package mvcc package mvcc
import ( import (
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"
) )

View File

@ -15,7 +15,7 @@
package mvcc package mvcc
import ( import (
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
) )
type metricsTxnWrite struct { type metricsTxnWrite struct {

View File

@ -18,7 +18,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"
) )

View File

@ -19,7 +19,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
) )

View File

@ -23,7 +23,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"
) )

View File

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
) )

View File

@ -22,7 +22,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"
) )

View File

@ -30,9 +30,9 @@ import (
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/raftsnap"
"github.com/coreos/etcd/internal/store" "github.com/coreos/etcd/internal/store"
"github.com/coreos/etcd/lease"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/fileutil"

View File

@ -21,7 +21,7 @@ import (
"runtime/pprof" "runtime/pprof"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/pkg/report" "github.com/coreos/etcd/pkg/report"
"github.com/spf13/cobra" "github.com/spf13/cobra"

View File

@ -18,7 +18,7 @@ import (
"os" "os"
"time" "time"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/internal/lease"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/spf13/cobra" "github.com/spf13/cobra"

View File

@ -20,7 +20,7 @@ import (
"path/filepath" "path/filepath"
bolt "github.com/coreos/bbolt" bolt "github.com/coreos/bbolt"
"github.com/coreos/etcd/lease/leasepb" "github.com/coreos/etcd/internal/lease/leasepb"
"github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend" "github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb" "github.com/coreos/etcd/mvcc/mvccpb"