Merge pull request #9238 from gyuho/internal

*: move packages to "internal"

CHANGELOG-3.4.md

@@ -26,7 +26,10 @@
   - Move `"github.com/coreos/etcd/alarm"` to [`"github.com/coreos/etcd/internal/alarm"`](https://github.com/coreos/etcd/pull/9234).
   - Move `"github.com/coreos/etcd/compactor"` to [`"github.com/coreos/etcd/internal/compactor"`](https://github.com/coreos/etcd/pull/9234).
   - Move `"github.com/coreos/etcd/discovery"` to [`"github.com/coreos/etcd/internal/discovery"`](https://github.com/coreos/etcd/pull/9233).
+  - Move `"github.com/coreos/etcd/lease"` to [`"github.com/coreos/etcd/internal/lease"`](https://github.com/coreos/etcd/pull/9238).
+  - Move `"github.com/coreos/etcd/mvcc"` to [`"github.com/coreos/etcd/internal/mvcc"`](https://github.com/coreos/etcd/pull/9238).
   - Move `"github.com/coreos/etcd/snap"` to [`"github.com/coreos/etcd/internal/raftsnap"`](https://github.com/coreos/etcd/pull/9211).
+  - Move `"github.com/coreos/etcd/store"` to [`"github.com/coreos/etcd/internal/store"`](https://github.com/coreos/etcd/pull/9238).
 
 ### Added(`etcd`)
 

Documentation/dev-guide/api_concurrency_reference_v3.md

@@ -143,7 +143,7 @@ The election service exposes client-side election facilities as a gRPC interface
 
 
 
-##### message `Event` (mvcc/mvccpb/kv.proto)
+##### message `Event` (internal/mvcc/mvccpb/kv.proto)
 
 | Field | Description | Type |
 | ----- | ----------- | ---- |
@@ -153,7 +153,7 @@ The election service exposes client-side election facilities as a gRPC interface
 
 
 
-##### message `KeyValue` (mvcc/mvccpb/kv.proto)
+##### message `KeyValue` (internal/mvcc/mvccpb/kv.proto)
 
 | Field | Description | Type |
 | ----- | ----------- | ---- |

Documentation/dev-guide/api_reference_v3.md

@@ -789,6 +789,8 @@ Empty field.
 | leader | leader is the member ID which the responding member believes is the current leader. | uint64 |
 | raftIndex | raftIndex is the current raft index of the responding member. | uint64 |
 | raftTerm | raftTerm is the current raft term of the responding member. | uint64 |
+| raftAppliedIndex | raftAppliedIndex is the current raft applied index of the responding member. | uint64 |
+| errors | errors contains alarm/health information and status. | (slice of) string |
 
 
 
@@ -860,7 +862,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive
 
 
 
-##### message `Event` (mvcc/mvccpb/kv.proto)
+##### message `Event` (internal/mvcc/mvccpb/kv.proto)
 
 | Field | Description | Type |
 | ----- | ----------- | ---- |
@@ -870,7 +872,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive
 
 
 
-##### message `KeyValue` (mvcc/mvccpb/kv.proto)
+##### message `KeyValue` (internal/mvcc/mvccpb/kv.proto)
 
 | Field | Description | Type |
 | ----- | ----------- | ---- |
@@ -883,7 +885,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive
 
 
 
-##### message `Lease` (lease/leasepb/lease.proto)
+##### message `Lease` (internal/lease/leasepb/lease.proto)
 
 | Field | Description | Type |
 | ----- | ----------- | ---- |
@@ -892,7 +894,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive
 
 
 
-##### message `LeaseInternalRequest` (lease/leasepb/lease.proto)
+##### message `LeaseInternalRequest` (internal/lease/leasepb/lease.proto)
 
 | Field | Description | Type |
 | ----- | ----------- | ---- |
@@ -900,7 +902,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive
 
 
 
-##### message `LeaseInternalResponse` (lease/leasepb/lease.proto)
+##### message `LeaseInternalResponse` (internal/lease/leasepb/lease.proto)
 
 | Field | Description | Type |
 | ----- | ----------- | ---- |

Documentation/dev-guide/apispec/swagger/rpc.swagger.json

@@ -2169,8 +2169,8 @@
           "format": "int64"
         },
         "errors": {
+          "description": "errors contains alarm/health information and status.",
           "type": "array",
-          "title": "errors contains alarm/health information and status",
           "items": {
             "type": "string"
           }
@@ -2184,7 +2184,7 @@
           "format": "uint64"
         },
         "raftAppliedIndex": {
-          "description": "appliedIndex is the current raft applied index of the responding member.",
+          "description": "raftAppliedIndex is the current raft applied index of the responding member.",
           "type": "string",
           "format": "uint64"
         },
@@ -2417,4 +2417,4 @@
       "ApiKey": []
     }
   ]
-}
+}

auth/range_perm_cache.go

@@ -16,7 +16,7 @@ package auth
 
 import (
 	"github.com/coreos/etcd/auth/authpb"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/coreos/etcd/pkg/adt"
 )
 

auth/store.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/coreos/etcd/auth/authpb"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 
 	"github.com/coreos/pkg/capnslog"
 	"golang.org/x/crypto/bcrypt"

auth/store_test.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/coreos/etcd/auth/authpb"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 
 	"golang.org/x/crypto/bcrypt"
 	"google.golang.org/grpc/metadata"

clientv3/concurrency/election.go

@@ -21,7 +21,7 @@ import (
 
 	v3 "github.com/coreos/etcd/clientv3"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 var (

clientv3/concurrency/key.go

@@ -20,7 +20,7 @@ import (
 
 	v3 "github.com/coreos/etcd/clientv3"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error {

clientv3/integration/kv_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	"github.com/coreos/etcd/integration"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 	"github.com/coreos/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"

clientv3/integration/maintenance_test.go

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

clientv3/integration/mirror_test.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/coreos/etcd/clientv3/mirror"
 	"github.com/coreos/etcd/integration"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 	"github.com/coreos/etcd/pkg/testutil"
 )
 

clientv3/integration/namespace_test.go

@@ -22,7 +22,7 @@ import (
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/namespace"
 	"github.com/coreos/etcd/integration"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 	"github.com/coreos/etcd/pkg/testutil"
 )
 

clientv3/integration/watch_test.go

@@ -27,7 +27,7 @@ import (
 	"github.com/coreos/etcd/etcdserver/api/v3rpc"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	"github.com/coreos/etcd/integration"
-	mvccpb "github.com/coreos/etcd/mvcc/mvccpb"
+	mvccpb "github.com/coreos/etcd/internal/mvcc/mvccpb"
 	"github.com/coreos/etcd/pkg/testutil"
 
 	"google.golang.org/grpc"

clientv3/leasing/cache.go

@@ -22,7 +22,7 @@ import (
 
 	v3 "github.com/coreos/etcd/clientv3"
 	v3pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 const revokeBackoff = 2 * time.Second

clientv3/leasing/kv.go

@@ -24,7 +24,7 @@ import (
 	"github.com/coreos/etcd/clientv3/concurrency"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

clientv3/watch.go

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

clientv3/watch_test.go

@@ -17,7 +17,7 @@ package clientv3
 import (
 	"testing"
 
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 func TestEvent(t *testing.T) {

contrib/recipes/barrier.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 // Barrier creates a key in etcd to block processes, then deletes the key to

contrib/recipes/client.go

@@ -19,7 +19,7 @@ import (
 	"errors"
 
 	v3 "github.com/coreos/etcd/clientv3"
-	spb "github.com/coreos/etcd/mvcc/mvccpb"
+	spb "github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 var (

contrib/recipes/double_barrier.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 // DoubleBarrier blocks processes on Enter until an expected count enters, then

contrib/recipes/priority_queue.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 // PriorityQueue implements a multi-reader, multi-writer distributed queue.

contrib/recipes/queue.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	v3 "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 // Queue implements a multi-reader, multi-writer distributed queue.

contrib/recipes/rwmutex.go

@@ -19,7 +19,7 @@ import (
 
 	v3 "github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 type RWMutex struct {

contrib/recipes/watch.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 // WaitEvents waits on a key until it observes the given events and returns the final one.

e2e/etcd_corrupt_test.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 
 	bolt "github.com/coreos/bbolt"
 )

etcdctl/ctlv3/command/defrag_command.go

@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/spf13/cobra"
 )
 

etcdctl/ctlv3/command/make_mirror_command.go

@@ -25,7 +25,7 @@ import (
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/mirror"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 
 	"github.com/spf13/cobra"
 )

etcdctl/ctlv3/command/migrate_command.go

@@ -30,14 +30,14 @@ import (
 	"github.com/coreos/etcd/etcdserver/api"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/etcdserver/membership"
+	"github.com/coreos/etcd/internal/mvcc"
+	"github.com/coreos/etcd/internal/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 	"github.com/coreos/etcd/internal/raftsnap"
-	"github.com/coreos/etcd/mvcc"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/store"
 	"github.com/coreos/etcd/pkg/pbutil"
 	"github.com/coreos/etcd/pkg/types"
 	"github.com/coreos/etcd/raft/raftpb"
-	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/wal"
 	"github.com/coreos/etcd/wal/walpb"
 	"github.com/gogo/protobuf/proto"

etcdctl/ctlv3/command/printer_fields.go

@@ -19,7 +19,7 @@ import (
 
 	v3 "github.com/coreos/etcd/clientv3"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	spb "github.com/coreos/etcd/mvcc/mvccpb"
+	spb "github.com/coreos/etcd/internal/mvcc/mvccpb"
 	"github.com/coreos/etcd/snapshot"
 )
 

etcdctl/ctlv3/command/printer_protobuf.go

@@ -20,7 +20,7 @@ import (
 
 	v3 "github.com/coreos/etcd/clientv3"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	mvccpb "github.com/coreos/etcd/mvcc/mvccpb"
+	mvccpb "github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 type pbPrinter struct{ printer }

etcdctl/ctlv3/command/util.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"regexp"
 
-	pb "github.com/coreos/etcd/mvcc/mvccpb"
+	pb "github.com/coreos/etcd/internal/mvcc/mvccpb"
 
 	"github.com/spf13/cobra"
 )

etcdserver/api/etcdhttp/peer.go

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

etcdserver/api/v2http/client.go

@@ -36,8 +36,8 @@ import (
 	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/etcdserver/membership"
 	"github.com/coreos/etcd/etcdserver/stats"
+	"github.com/coreos/etcd/internal/store"
 	"github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/etcd/store"
 
 	"github.com/jonboulle/clockwork"
 )

etcdserver/api/v2http/client_test.go

@@ -35,10 +35,10 @@ import (
 	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/etcdserver/membership"
+	"github.com/coreos/etcd/internal/store"
 	"github.com/coreos/etcd/pkg/testutil"
 	"github.com/coreos/etcd/pkg/types"
 	"github.com/coreos/etcd/raft/raftpb"
-	"github.com/coreos/etcd/store"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/jonboulle/clockwork"

etcdserver/api/v2v3/store.go

@@ -24,8 +24,8 @@ import (
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
 	etcdErr "github.com/coreos/etcd/error"
-	"github.com/coreos/etcd/mvcc/mvccpb"
-	"github.com/coreos/etcd/store"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/store"
 )
 
 // store implements the Store interface for V2 using

etcdserver/api/v2v3/watcher.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	etcdErr "github.com/coreos/etcd/error"
-	"github.com/coreos/etcd/store"
+	"github.com/coreos/etcd/internal/store"
 )
 
 func (s *v2v3Store) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (store.Watcher, error) {

etcdserver/api/v3election/v3electionpb/v3election.pb.go

@@ -31,7 +31,7 @@ import (
 
 	etcdserverpb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 
-	mvccpb "github.com/coreos/etcd/mvcc/mvccpb"
+	mvccpb "github.com/coreos/etcd/internal/mvcc/mvccpb"
 
 	context "golang.org/x/net/context"
 
@@ -2041,39 +2041,39 @@ var (
 func init() { proto.RegisterFile("v3election.proto", fileDescriptorV3Election) }
 
 var fileDescriptorV3Election = []byte{
-	// 538 bytes of a gzipped FileDescriptorProto
+	// 544 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x65, 0x9d, 0x10, 0xca, 0x90, 0xb6, 0x96, 0x55, 0xa9, 0x69, 0x48, 0xad, 0x68, 0x8b, 0x50,
-	0x95, 0x83, 0x17, 0x35, 0x9c, 0x72, 0x42, 0x20, 0x50, 0xa5, 0x22, 0x01, 0x3e, 0x20, 0x38, 0xae,
-	0xdd, 0x91, 0x1b, 0xc5, 0xf1, 0x1a, 0xdb, 0xb5, 0x94, 0x2b, 0xbf, 0xc0, 0x85, 0x7f, 0xe0, 0x47,
-	0x38, 0x22, 0xf1, 0x03, 0x28, 0xf0, 0x21, 0x68, 0x77, 0x6d, 0xec, 0xb8, 0x21, 0x42, 0xe4, 0x62,
+	0x10, 0x65, 0x9d, 0x10, 0xca, 0x90, 0xb6, 0x96, 0x55, 0xa9, 0x21, 0xa4, 0x56, 0xb4, 0x45, 0xa8,
+	0xca, 0xc1, 0x8b, 0x1a, 0x4e, 0x39, 0x21, 0x10, 0xa8, 0x52, 0x91, 0x00, 0x1f, 0x10, 0x1c, 0xd7,
+	0xee, 0xc8, 0x8d, 0xe2, 0x78, 0x8d, 0xed, 0x5a, 0xca, 0x95, 0x5f, 0xe0, 0xc2, 0x3f, 0xf0, 0x23,
+	0x1c, 0x91, 0xf8, 0x01, 0x14, 0xf8, 0x10, 0xb4, 0xbb, 0x36, 0x76, 0xdc, 0x10, 0xa1, 0xe6, 0x62,
 	0x8d, 0x67, 0x9e, 0xe7, 0xcd, 0x7b, 0x3b, 0x6b, 0x30, 0xf3, 0x31, 0x86, 0xe8, 0x67, 0x53, 0x11,
 	0x39, 0x71, 0x22, 0x32, 0x61, 0x75, 0xab, 0x4c, 0xec, 0xf5, 0x0f, 0x02, 0x11, 0x08, 0x55, 0x60,
-	0x32, 0xd2, 0x98, 0xfe, 0x43, 0xcc, 0xfc, 0x4b, 0x26, 0x1f, 0x29, 0x26, 0x39, 0x26, 0xb5, 0x30,
-	0xf6, 0x58, 0x12, 0xfb, 0x05, 0xee, 0x48, 0xe1, 0xe6, 0xb9, 0xef, 0xab, 0x47, 0xec, 0xb1, 0x59,
-	0x5e, 0x94, 0x06, 0x81, 0x10, 0x41, 0x88, 0x8c, 0xc7, 0x53, 0xc6, 0xa3, 0x48, 0x64, 0x5c, 0x32,
-	0xa6, 0xba, 0x4a, 0xdf, 0xc0, 0xfe, 0x33, 0x3e, 0x8f, 0xf9, 0x34, 0x88, 0x5c, 0xfc, 0x70, 0x8d,
-	0x69, 0x66, 0x59, 0xd0, 0x8e, 0xf8, 0x1c, 0x7b, 0x64, 0x48, 0x4e, 0xbb, 0xae, 0x8a, 0xad, 0x03,
-	0xb8, 0x1d, 0x22, 0x4f, 0xb1, 0x67, 0x0c, 0xc9, 0x69, 0xcb, 0xd5, 0x2f, 0x32, 0x9b, 0xf3, 0xf0,
-	0x1a, 0x7b, 0x2d, 0x05, 0xd5, 0x2f, 0x74, 0x01, 0x66, 0xd5, 0x32, 0x8d, 0x45, 0x94, 0xa2, 0xf5,
-	0x18, 0x3a, 0x57, 0xc8, 0x2f, 0x31, 0x51, 0x5d, 0xef, 0x9d, 0x0d, 0x9c, 0xba, 0x10, 0xa7, 0xc4,
-	0x9d, 0x2b, 0x8c, 0x5b, 0x60, 0x2d, 0x06, 0x9d, 0x50, 0x7f, 0x65, 0xa8, 0xaf, 0x0e, 0x9d, 0xba,
-	0x65, 0xce, 0x4b, 0x55, 0xbb, 0xc0, 0x85, 0x5b, 0xc0, 0xe8, 0x7b, 0xb8, 0xfb, 0x27, 0xb9, 0x56,
-	0x87, 0x09, 0xad, 0x19, 0x2e, 0x54, 0xbb, 0xae, 0x2b, 0x43, 0x99, 0x49, 0x30, 0x57, 0x0a, 0x5a,
-	0xae, 0x0c, 0x2b, 0xad, 0xed, 0x9a, 0x56, 0x7a, 0x02, 0xbb, 0xba, 0xf5, 0x06, 0x9b, 0xe8, 0x15,
-	0xec, 0x95, 0xa0, 0xad, 0x84, 0x0f, 0xc1, 0x98, 0xe5, 0x85, 0x68, 0xd3, 0xd1, 0x27, 0xea, 0x5c,
-	0xe0, 0xe2, 0xad, 0x34, 0xd8, 0x35, 0x66, 0x39, 0x7d, 0x02, 0xbb, 0x2e, 0xa6, 0xb5, 0x53, 0xab,
-	0xbc, 0x22, 0xff, 0xe6, 0xd5, 0x0b, 0xd8, 0x2b, 0x3b, 0x6c, 0x33, 0x2b, 0x7d, 0x07, 0xfb, 0xaf,
-	0x13, 0xe1, 0x87, 0x7c, 0x3a, 0xff, 0xdf, 0x59, 0xaa, 0x45, 0x32, 0xea, 0x8b, 0x74, 0x0e, 0x66,
-	0xd5, 0x79, 0x9b, 0x19, 0xcf, 0xbe, 0xb4, 0x61, 0xe7, 0x79, 0x31, 0x80, 0x25, 0x60, 0xa7, 0xdc,
-	0x4f, 0xeb, 0x78, 0x75, 0xb2, 0xc6, 0x55, 0xe8, 0xdb, 0x7f, 0x2b, 0x6b, 0x16, 0xfa, 0xe0, 0xe3,
-	0xf7, 0x5f, 0x9f, 0x0c, 0x9b, 0x1e, 0xb1, 0x7c, 0xec, 0x61, 0xc6, 0x59, 0x09, 0x66, 0x7e, 0x01,
-	0x9d, 0x90, 0x91, 0x24, 0x2c, 0x75, 0x34, 0x09, 0x1b, 0xce, 0x35, 0x09, 0x9b, 0xf2, 0x37, 0x10,
-	0xc6, 0x05, 0x54, 0x12, 0x06, 0xd0, 0xd1, 0x1e, 0x5b, 0xf7, 0xd7, 0x39, 0x5f, 0x92, 0x0d, 0xd6,
-	0x17, 0x0b, 0x2a, 0xaa, 0xa8, 0x06, 0xf4, 0xf0, 0x06, 0x95, 0x3e, 0x34, 0x49, 0x34, 0x83, 0x3b,
-	0xaf, 0x3c, 0x65, 0xfe, 0x36, 0x4c, 0x27, 0x8a, 0xe9, 0x98, 0xf6, 0x6e, 0x30, 0x09, 0xdd, 0x7c,
-	0x42, 0x46, 0x8f, 0x88, 0x54, 0xa5, 0x17, 0xb6, 0xc9, 0xb5, 0x72, 0x11, 0x9a, 0x5c, 0xab, 0x3b,
-	0xbe, 0x41, 0x55, 0xa2, 0x80, 0x13, 0x32, 0x7a, 0x6a, 0x7e, 0x5d, 0xda, 0xe4, 0xdb, 0xd2, 0x26,
-	0x3f, 0x96, 0x36, 0xf9, 0xfc, 0xd3, 0xbe, 0xe5, 0x75, 0xd4, 0xcf, 0x72, 0xfc, 0x3b, 0x00, 0x00,
-	0xff, 0xff, 0xdc, 0xa9, 0x0e, 0xdf, 0xc5, 0x05, 0x00, 0x00,
+	0x32, 0xd2, 0x98, 0xfe, 0x23, 0xcc, 0xfc, 0x0b, 0x26, 0x1f, 0x29, 0x26, 0x39, 0x26, 0xb5, 0x30,
+	0xf6, 0x58, 0x12, 0xfb, 0x05, 0x8e, 0x2a, 0xdc, 0x34, 0xca, 0x30, 0x89, 0x78, 0xc8, 0xe6, 0xb9,
+	0xef, 0xab, 0x47, 0xec, 0xb1, 0x59, 0x5e, 0x60, 0x06, 0x81, 0x10, 0x41, 0x88, 0x8c, 0xc7, 0x53,
+	0xc6, 0xa3, 0x48, 0x64, 0x5c, 0x52, 0xa7, 0xba, 0x4a, 0xdf, 0xc2, 0xfe, 0x73, 0x3e, 0x8f, 0xf9,
+	0x34, 0x88, 0x5c, 0xfc, 0x78, 0x85, 0x69, 0x66, 0x59, 0xd0, 0x8e, 0xf8, 0x1c, 0x7b, 0x64, 0x48,
+	0x4e, 0xba, 0xae, 0x8a, 0xad, 0x03, 0xb8, 0x1d, 0x22, 0x4f, 0xb1, 0x67, 0x0c, 0xc9, 0x49, 0xcb,
+	0xd5, 0x2f, 0x32, 0x9b, 0xf3, 0xf0, 0x0a, 0x7b, 0x2d, 0x05, 0xd5, 0x2f, 0x74, 0x01, 0x66, 0xd5,
+	0x32, 0x8d, 0x45, 0x94, 0xa2, 0xf5, 0x04, 0x3a, 0x97, 0xc8, 0x2f, 0x30, 0x51, 0x5d, 0xef, 0x9d,
+	0x0e, 0x9c, 0xba, 0x22, 0xa7, 0xc4, 0x9d, 0x29, 0x8c, 0x5b, 0x60, 0x2d, 0x06, 0x9d, 0x50, 0x7f,
+	0x65, 0xa8, 0xaf, 0x0e, 0x9d, 0xba, 0x77, 0xce, 0x2b, 0x55, 0x3b, 0xc7, 0x85, 0x5b, 0xc0, 0xe8,
+	0x07, 0xb8, 0xfb, 0x37, 0xb9, 0x56, 0x87, 0x09, 0xad, 0x19, 0x2e, 0x54, 0xbb, 0xae, 0x2b, 0x43,
+	0x99, 0x49, 0x30, 0x57, 0x0a, 0x5a, 0xae, 0x0c, 0x2b, 0xad, 0xed, 0x9a, 0x56, 0x7a, 0x0c, 0xbb,
+	0xba, 0xf5, 0x06, 0x9b, 0xe8, 0x25, 0xec, 0x95, 0xa0, 0xad, 0x84, 0x0f, 0xc1, 0x98, 0xe5, 0x85,
+	0x68, 0xd3, 0xd1, 0x27, 0xea, 0x9c, 0xe3, 0xe2, 0x9d, 0x34, 0xd8, 0x35, 0x66, 0x39, 0x7d, 0x0a,
+	0xbb, 0x2e, 0xa6, 0xb5, 0x53, 0xab, 0xbc, 0x22, 0xff, 0xe7, 0xd5, 0x4b, 0xd8, 0x2b, 0x3b, 0x6c,
+	0x33, 0x2b, 0x7d, 0x0f, 0xfb, 0x6f, 0x12, 0xe1, 0x87, 0x7c, 0x3a, 0xbf, 0xe9, 0x2c, 0xd5, 0x22,
+	0x19, 0xf5, 0x45, 0x3a, 0x03, 0xb3, 0xea, 0xbc, 0xcd, 0x8c, 0xa7, 0x5f, 0xdb, 0xb0, 0xf3, 0xa2,
+	0x18, 0xc0, 0x12, 0xb0, 0x53, 0xee, 0xa7, 0x75, 0xb4, 0x3a, 0x59, 0xe3, 0x2a, 0xf4, 0xed, 0x7f,
+	0x95, 0x35, 0x0b, 0x7d, 0xf8, 0xe9, 0xc7, 0xef, 0xcf, 0x86, 0x4d, 0xef, 0xb3, 0x7c, 0xec, 0x61,
+	0xc6, 0x59, 0x09, 0x66, 0x7e, 0x01, 0x9d, 0x90, 0x91, 0x24, 0x2c, 0x75, 0x34, 0x09, 0x1b, 0xce,
+	0x35, 0x09, 0x9b, 0xf2, 0x37, 0x10, 0xc6, 0x05, 0x54, 0x12, 0x06, 0xd0, 0xd1, 0x1e, 0x5b, 0x0f,
+	0xd6, 0x39, 0x5f, 0x92, 0x0d, 0xd6, 0x17, 0x0b, 0x2a, 0xaa, 0xa8, 0x06, 0xf4, 0xf0, 0x1a, 0x95,
+	0x3e, 0x34, 0x49, 0x34, 0x83, 0x3b, 0xaf, 0x3d, 0x65, 0xfe, 0x36, 0x4c, 0xc7, 0x8a, 0xe9, 0x88,
+	0xf6, 0xae, 0x31, 0x09, 0xdd, 0x7c, 0x42, 0x46, 0x8f, 0x89, 0x54, 0xa5, 0x17, 0xb6, 0xc9, 0xb5,
+	0x72, 0x11, 0x9a, 0x5c, 0xab, 0x3b, 0xbe, 0x41, 0x55, 0xa2, 0x80, 0x13, 0x32, 0x7a, 0x66, 0x7e,
+	0x5b, 0xda, 0xe4, 0xfb, 0xd2, 0x26, 0x3f, 0x97, 0x36, 0xf9, 0xf2, 0xcb, 0xbe, 0xe5, 0x75, 0xd4,
+	0xcf, 0x72, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0x10, 0xc5, 0xc8, 0x9a, 0xce, 0x05, 0x00, 0x00,
 }

etcdserver/api/v3election/v3electionpb/v3election.proto

@@ -3,7 +3,7 @@ package v3electionpb;
 
 import "gogoproto/gogo.proto";
 import "etcd/etcdserver/etcdserverpb/rpc.proto";
-import "etcd/mvcc/mvccpb/kv.proto";
+import "etcd/internal/mvcc/mvccpb/kv.proto";
 
 // for grpc-gateway
 import "google/api/annotations.proto";

etcdserver/api/v3rpc/lease.go

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

etcdserver/api/v3rpc/maintenance.go

@@ -23,8 +23,8 @@ import (
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/coreos/etcd/pkg/types"
 	"github.com/coreos/etcd/raft"
 	"github.com/coreos/etcd/version"

etcdserver/api/v3rpc/util.go

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

etcdserver/api/v3rpc/util_test.go

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

etcdserver/api/v3rpc/watch.go

@@ -24,8 +24,8 @@ import (
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 type watchServer struct {

etcdserver/apply.go

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

etcdserver/apply_auth.go

@@ -19,8 +19,8 @@ import (
 
 	"github.com/coreos/etcd/auth"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc"
+	"github.com/coreos/etcd/internal/lease"
+	"github.com/coreos/etcd/internal/mvcc"
 )
 
 type authApplierV3 struct {

etcdserver/apply_v2.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/coreos/etcd/etcdserver/api"
 	"github.com/coreos/etcd/etcdserver/membership"
+	"github.com/coreos/etcd/internal/store"
 	"github.com/coreos/etcd/pkg/pbutil"
-	"github.com/coreos/etcd/store"
 	"github.com/coreos/go-semver/semver"
 )
 

etcdserver/auth/auth_test.go

@@ -23,7 +23,7 @@ import (
 	etcderr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/etcdserverpb"
-	etcdstore "github.com/coreos/etcd/store"
+	etcdstore "github.com/coreos/etcd/internal/store"
 )
 
 type fakeDoer struct{}

etcdserver/backend.go

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

etcdserver/corrupt.go

@@ -22,7 +22,7 @@ import (
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc"
+	"github.com/coreos/etcd/internal/mvcc"
 	"github.com/coreos/etcd/pkg/types"
 )
 

etcdserver/etcdserverpb/rpc.pb.go

@@ -12,7 +12,7 @@ import (
 
 	_ "github.com/gogo/protobuf/gogoproto"
 
-	mvccpb "github.com/coreos/etcd/mvcc/mvccpb"
+	mvccpb "github.com/coreos/etcd/internal/mvcc/mvccpb"
 
 	authpb "github.com/coreos/etcd/auth/authpb"
 
@@ -2446,7 +2446,7 @@ type StatusResponse struct {
 	RaftTerm uint64 `protobuf:"varint,6,opt,name=raftTerm,proto3" json:"raftTerm,omitempty"`
 	// raftAppliedIndex is the current raft applied index of the responding member.
 	RaftAppliedIndex uint64 `protobuf:"varint,7,opt,name=raftAppliedIndex,proto3" json:"raftAppliedIndex,omitempty"`
-	// errors contains alarm/health information and status
+	// errors contains alarm/health information and status.
 	Errors []string `protobuf:"bytes,8,rep,name=errors" json:"errors,omitempty"`
 }
 
@@ -18566,237 +18566,237 @@ var (
 func init() { proto.RegisterFile("rpc.proto", fileDescriptorRpc) }
 
 var fileDescriptorRpc = []byte{
-	// 3701 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5b, 0x5b, 0x73, 0x1b, 0xcb,
-	0x71, 0xe6, 0x02, 0xc4, 0xad, 0x71, 0x21, 0x34, 0xa4, 0x24, 0x10, 0x92, 0x28, 0x6a, 0x74, 0xa3,
-	0x2e, 0x87, 0xb0, 0x69, 0x27, 0x0f, 0x4a, 0xca, 0x65, 0x8a, 0x84, 0x45, 0x9a, 0x14, 0x49, 0x2f,
-	0x41, 0x9d, 0x93, 0x2a, 0x27, 0xac, 0x25, 0x30, 0x24, 0x37, 0x04, 0x76, 0x91, 0xdd, 0x05, 0x44,
-	0x2a, 0xae, 0xa4, 0xca, 0x71, 0x52, 0x79, 0x49, 0x1e, 0xe2, 0xaa, 0x54, 0x92, 0xd7, 0x54, 0xca,
-	0xe5, 0x1f, 0xe0, 0xca, 0x5f, 0xc8, 0x5b, 0x52, 0x95, 0x3f, 0x90, 0x3a, 0xc9, 0x4b, 0x7e, 0x41,
-	0x2e, 0x4f, 0xae, 0xb9, 0xed, 0xce, 0xde, 0x40, 0xda, 0xf0, 0x39, 0x2f, 0xd4, 0x4e, 0x4f, 0x4f,
-	0x77, 0x4f, 0xcf, 0x74, 0xf7, 0xcc, 0x37, 0x10, 0x94, 0x9c, 0x61, 0x77, 0x75, 0xe8, 0xd8, 0x9e,
-	0x8d, 0x2a, 0xc4, 0xeb, 0xf6, 0x5c, 0xe2, 0x8c, 0x89, 0x33, 0x3c, 0x69, 0x2e, 0x9c, 0xd9, 0x67,
-	0x36, 0xeb, 0x68, 0xd1, 0x2f, 0xce, 0xd3, 0x5c, 0xa4, 0x3c, 0xad, 0xc1, 0xb8, 0xdb, 0x65, 0x7f,
-	0x86, 0x27, 0xad, 0x8b, 0xb1, 0xe8, 0xba, 0xc7, 0xba, 0x8c, 0x91, 0x77, 0xce, 0xfe, 0x0c, 0x4f,
-	0xd8, 0x3f, 0xa2, 0xf3, 0xfe, 0x99, 0x6d, 0x9f, 0xf5, 0x49, 0xcb, 0x18, 0x9a, 0x2d, 0xc3, 0xb2,
-	0x6c, 0xcf, 0xf0, 0x4c, 0xdb, 0x72, 0x79, 0x2f, 0xfe, 0x73, 0x0d, 0x6a, 0x3a, 0x71, 0x87, 0xb6,
-	0xe5, 0x92, 0x2d, 0x62, 0xf4, 0x88, 0x83, 0x1e, 0x00, 0x74, 0xfb, 0x23, 0xd7, 0x23, 0xce, 0xb1,
-	0xd9, 0x6b, 0x68, 0xcb, 0xda, 0xca, 0xac, 0x5e, 0x12, 0x94, 0xed, 0x1e, 0xba, 0x07, 0xa5, 0x01,
-	0x19, 0x9c, 0xf0, 0xde, 0x0c, 0xeb, 0x2d, 0x72, 0xc2, 0x76, 0x0f, 0x35, 0xa1, 0xe8, 0x90, 0xb1,
-	0xe9, 0x9a, 0xb6, 0xd5, 0xc8, 0x2e, 0x6b, 0x2b, 0x59, 0xdd, 0x6f, 0xd3, 0x81, 0x8e, 0x71, 0xea,
-	0x1d, 0x7b, 0xc4, 0x19, 0x34, 0x66, 0xf9, 0x40, 0x4a, 0xe8, 0x10, 0x67, 0x80, 0x7f, 0x92, 0x83,
-	0x8a, 0x6e, 0x58, 0x67, 0x44, 0x27, 0x7f, 0x34, 0x22, 0xae, 0x87, 0xea, 0x90, 0xbd, 0x20, 0x57,
-	0x4c, 0x7d, 0x45, 0xa7, 0x9f, 0x7c, 0xbc, 0x75, 0x46, 0x8e, 0x89, 0xc5, 0x15, 0x57, 0xe8, 0x78,
-	0xeb, 0x8c, 0xb4, 0xad, 0x1e, 0x5a, 0x80, 0x5c, 0xdf, 0x1c, 0x98, 0x9e, 0xd0, 0xca, 0x1b, 0x21,
-	0x73, 0x66, 0x23, 0xe6, 0x6c, 0x00, 0xb8, 0xb6, 0xe3, 0x1d, 0xdb, 0x4e, 0x8f, 0x38, 0x8d, 0xdc,
-	0xb2, 0xb6, 0x52, 0x5b, 0x7b, 0xb2, 0xaa, 0x2e, 0xc4, 0xaa, 0x6a, 0xd0, 0xea, 0xa1, 0xed, 0x78,
-	0xfb, 0x94, 0x57, 0x2f, 0xb9, 0xf2, 0x13, 0x7d, 0x0f, 0xca, 0x4c, 0x88, 0x67, 0x38, 0x67, 0xc4,
-	0x6b, 0xe4, 0x99, 0x94, 0xa7, 0xd7, 0x48, 0xe9, 0x30, 0x66, 0x9d, 0xa9, 0xe7, 0xdf, 0x08, 0x43,
-	0xc5, 0x25, 0x8e, 0x69, 0xf4, 0xcd, 0x4f, 0xc6, 0x49, 0x9f, 0x34, 0x0a, 0xcb, 0xda, 0x4a, 0x51,
-	0x0f, 0xd1, 0xe8, 0xfc, 0x2f, 0xc8, 0x95, 0x7b, 0x6c, 0x5b, 0xfd, 0xab, 0x46, 0x91, 0x31, 0x14,
-	0x29, 0x61, 0xdf, 0xea, 0x5f, 0xb1, 0x45, 0xb3, 0x47, 0x96, 0xc7, 0x7b, 0x4b, 0xac, 0xb7, 0xc4,
-	0x28, 0xac, 0x7b, 0x05, 0xea, 0x03, 0xd3, 0x3a, 0x1e, 0xd8, 0xbd, 0x63, 0xdf, 0x21, 0xc0, 0x1c,
-	0x52, 0x1b, 0x98, 0xd6, 0x7b, 0xbb, 0xa7, 0x4b, 0xb7, 0x50, 0x4e, 0xe3, 0x32, 0xcc, 0x59, 0x16,
-	0x9c, 0xc6, 0xa5, 0xca, 0xb9, 0x0a, 0xf3, 0x54, 0x66, 0xd7, 0x21, 0x86, 0x47, 0x02, 0xe6, 0x0a,
-	0x63, 0xbe, 0x35, 0x30, 0xad, 0x0d, 0xd6, 0x13, 0xe2, 0x37, 0x2e, 0x63, 0xfc, 0x55, 0xc1, 0x6f,
-	0x5c, 0x86, 0xf9, 0xf1, 0x2a, 0x94, 0x7c, 0x9f, 0xa3, 0x22, 0xcc, 0xee, 0xed, 0xef, 0xb5, 0xeb,
-	0x33, 0x08, 0x20, 0xbf, 0x7e, 0xb8, 0xd1, 0xde, 0xdb, 0xac, 0x6b, 0xa8, 0x0c, 0x85, 0xcd, 0x36,
-	0x6f, 0x64, 0xf0, 0x5b, 0x80, 0xc0, 0xbb, 0xa8, 0x00, 0xd9, 0x9d, 0xf6, 0xef, 0xd5, 0x67, 0x28,
-	0xcf, 0x87, 0xb6, 0x7e, 0xb8, 0xbd, 0xbf, 0x57, 0xd7, 0xe8, 0xe0, 0x0d, 0xbd, 0xbd, 0xde, 0x69,
-	0xd7, 0x33, 0x94, 0xe3, 0xfd, 0xfe, 0x66, 0x3d, 0x8b, 0x4a, 0x90, 0xfb, 0xb0, 0xbe, 0x7b, 0xd4,
-	0xae, 0xcf, 0xe2, 0x9f, 0x6a, 0x50, 0x15, 0xeb, 0xc5, 0x63, 0x02, 0x7d, 0x1b, 0xf2, 0xe7, 0x2c,
-	0x2e, 0xd8, 0x56, 0x2c, 0xaf, 0xdd, 0x8f, 0x2c, 0x6e, 0x28, 0x76, 0x74, 0xc1, 0x8b, 0x30, 0x64,
-	0x2f, 0xc6, 0x6e, 0x23, 0xb3, 0x9c, 0x5d, 0x29, 0xaf, 0xd5, 0x57, 0x79, 0xc0, 0xae, 0xee, 0x90,
-	0xab, 0x0f, 0x46, 0x7f, 0x44, 0x74, 0xda, 0x89, 0x10, 0xcc, 0x0e, 0x6c, 0x87, 0xb0, 0x1d, 0x5b,
-	0xd4, 0xd9, 0x37, 0xdd, 0xc6, 0x6c, 0xd1, 0xc4, 0x6e, 0xe5, 0x0d, 0xfc, 0x73, 0x0d, 0xe0, 0x60,
-	0xe4, 0xa5, 0x87, 0xc6, 0x02, 0xe4, 0xc6, 0x54, 0xb0, 0x08, 0x0b, 0xde, 0x60, 0x31, 0x41, 0x0c,
-	0x97, 0xf8, 0x31, 0x41, 0x1b, 0xe8, 0x2e, 0x14, 0x86, 0x0e, 0x19, 0x1f, 0x5f, 0x8c, 0x99, 0x92,
-	0xa2, 0x9e, 0xa7, 0xcd, 0x9d, 0x31, 0x7a, 0x04, 0x15, 0xf3, 0xcc, 0xb2, 0x1d, 0x72, 0xcc, 0x65,
-	0xe5, 0x58, 0x6f, 0x99, 0xd3, 0x98, 0xdd, 0x0a, 0x0b, 0x17, 0x9c, 0x57, 0x59, 0x76, 0x29, 0x09,
-	0x5b, 0x50, 0x66, 0xa6, 0x4e, 0xe5, 0xbe, 0x17, 0x81, 0x8d, 0x19, 0x36, 0x2c, 0xee, 0x42, 0x61,
-	0x35, 0xfe, 0x21, 0xa0, 0x4d, 0xd2, 0x27, 0x1e, 0x99, 0x26, 0x7b, 0x28, 0x3e, 0xc9, 0xaa, 0x3e,
-	0xc1, 0x7f, 0xa3, 0xc1, 0x7c, 0x48, 0xfc, 0x54, 0xd3, 0x6a, 0x40, 0xa1, 0xc7, 0x84, 0x71, 0x0b,
-	0xb2, 0xba, 0x6c, 0xa2, 0x57, 0x50, 0x14, 0x06, 0xb8, 0x8d, 0x6c, 0xca, 0xa6, 0x29, 0x70, 0x9b,
-	0x5c, 0xfc, 0xf3, 0x0c, 0x94, 0xc4, 0x44, 0xf7, 0x87, 0x68, 0x1d, 0xaa, 0x0e, 0x6f, 0x1c, 0xb3,
-	0xf9, 0x08, 0x8b, 0x9a, 0xe9, 0x49, 0x68, 0x6b, 0x46, 0xaf, 0x88, 0x21, 0x8c, 0x8c, 0x7e, 0x07,
-	0xca, 0x52, 0xc4, 0x70, 0xe4, 0x09, 0x97, 0x37, 0xc2, 0x02, 0x82, 0xfd, 0xb7, 0x35, 0xa3, 0x83,
-	0x60, 0x3f, 0x18, 0x79, 0xa8, 0x03, 0x0b, 0x72, 0x30, 0x9f, 0x8d, 0x30, 0x23, 0xcb, 0xa4, 0x2c,
-	0x87, 0xa5, 0xc4, 0x97, 0x6a, 0x6b, 0x46, 0x47, 0x62, 0xbc, 0xd2, 0xa9, 0x9a, 0xe4, 0x5d, 0xf2,
-	0xe4, 0x1d, 0x33, 0xa9, 0x73, 0x69, 0xc5, 0x4d, 0xea, 0x5c, 0x5a, 0x6f, 0x4b, 0x50, 0x10, 0x2d,
-	0xfc, 0xcf, 0x19, 0x00, 0xb9, 0x1a, 0xfb, 0x43, 0xb4, 0x09, 0x35, 0x47, 0xb4, 0x42, 0xde, 0xba,
-	0x97, 0xe8, 0x2d, 0xb1, 0x88, 0x33, 0x7a, 0x55, 0x0e, 0xe2, 0xc6, 0x7d, 0x07, 0x2a, 0xbe, 0x94,
-	0xc0, 0x61, 0x8b, 0x09, 0x0e, 0xf3, 0x25, 0x94, 0xe5, 0x00, 0xea, 0xb2, 0xcf, 0xe1, 0xb6, 0x3f,
-	0x3e, 0xc1, 0x67, 0x8f, 0x26, 0xf8, 0xcc, 0x17, 0x38, 0x2f, 0x25, 0xa8, 0x5e, 0x53, 0x0d, 0x0b,
-	0xdc, 0xb6, 0x98, 0xe0, 0xb6, 0xb8, 0x61, 0xd4, 0x71, 0x40, 0xeb, 0x25, 0x6f, 0xe2, 0xff, 0xce,
-	0x42, 0x61, 0xc3, 0x1e, 0x0c, 0x0d, 0x87, 0xae, 0x46, 0xde, 0x21, 0xee, 0xa8, 0xef, 0x31, 0x77,
-	0xd5, 0xd6, 0x1e, 0x87, 0x25, 0x0a, 0x36, 0xf9, 0xaf, 0xce, 0x58, 0x75, 0x31, 0x84, 0x0e, 0x16,
-	0xe5, 0x31, 0x73, 0x83, 0xc1, 0xa2, 0x38, 0x8a, 0x21, 0x32, 0x90, 0xb3, 0x41, 0x20, 0x37, 0xa1,
-	0x30, 0x26, 0x4e, 0x50, 0xd2, 0xb7, 0x66, 0x74, 0x49, 0x40, 0x2f, 0x60, 0x2e, 0x5a, 0x5e, 0x72,
-	0x82, 0xa7, 0xd6, 0x0d, 0x57, 0xa3, 0xc7, 0x50, 0x09, 0xd5, 0xb8, 0xbc, 0xe0, 0x2b, 0x0f, 0x94,
-	0x12, 0x77, 0x47, 0xe6, 0x55, 0x5a, 0x8f, 0x2b, 0x5b, 0x33, 0x32, 0xb3, 0xde, 0x91, 0x99, 0xb5,
-	0x28, 0x46, 0x89, 0xdc, 0x1a, 0x4a, 0x32, 0xdf, 0x0d, 0x27, 0x19, 0xfc, 0x5d, 0xa8, 0x86, 0x1c,
-	0x44, 0xeb, 0x4e, 0xfb, 0x07, 0x47, 0xeb, 0xbb, 0xbc, 0x48, 0xbd, 0x63, 0x75, 0x49, 0xaf, 0x6b,
-	0xb4, 0xd6, 0xed, 0xb6, 0x0f, 0x0f, 0xeb, 0x19, 0x54, 0x85, 0xd2, 0xde, 0x7e, 0xe7, 0x98, 0x73,
-	0x65, 0xf1, 0x3b, 0x5f, 0x82, 0x28, 0x72, 0x4a, 0x6d, 0x9b, 0x51, 0x6a, 0x9b, 0x26, 0x6b, 0x5b,
-	0x26, 0xa8, 0x6d, 0xac, 0xcc, 0xed, 0xb6, 0xd7, 0x0f, 0xdb, 0xf5, 0xd9, 0xb7, 0x35, 0xa8, 0x70,
-	0xff, 0x1e, 0x8f, 0x2c, 0x5a, 0x6a, 0xff, 0x51, 0x03, 0x08, 0xa2, 0x09, 0xb5, 0xa0, 0xd0, 0xe5,
-	0x7a, 0x1a, 0x1a, 0x4b, 0x46, 0xb7, 0x13, 0x97, 0x4c, 0x97, 0x5c, 0xe8, 0x9b, 0x50, 0x70, 0x47,
-	0xdd, 0x2e, 0x71, 0x65, 0xc9, 0xbb, 0x1b, 0xcd, 0x87, 0x22, 0x5b, 0xe9, 0x92, 0x8f, 0x0e, 0x39,
-	0x35, 0xcc, 0xfe, 0x88, 0x15, 0xc0, 0xc9, 0x43, 0x04, 0x1f, 0xfe, 0x7b, 0x0d, 0xca, 0xca, 0xe6,
-	0xfd, 0x35, 0x93, 0xf0, 0x7d, 0x28, 0x31, 0x1b, 0x48, 0x4f, 0xa4, 0xe1, 0xa2, 0x1e, 0x10, 0xd0,
-	0x6f, 0x43, 0x49, 0x46, 0x80, 0xcc, 0xc4, 0x8d, 0x64, 0xb1, 0xfb, 0x43, 0x3d, 0x60, 0xc5, 0x3b,
-	0x70, 0x8b, 0x79, 0xa5, 0x4b, 0x0f, 0xd7, 0xd2, 0x8f, 0xea, 0xf1, 0x53, 0x8b, 0x1c, 0x3f, 0x9b,
-	0x50, 0x1c, 0x9e, 0x5f, 0xb9, 0x66, 0xd7, 0xe8, 0x0b, 0x2b, 0xfc, 0x36, 0xfe, 0x3e, 0x20, 0x55,
-	0xd8, 0x34, 0xd3, 0xc5, 0x55, 0x28, 0x6f, 0x19, 0xee, 0xb9, 0x30, 0x09, 0xbf, 0x82, 0x2a, 0x6d,
-	0xee, 0x7c, 0xb8, 0x81, 0x8d, 0xec, 0x72, 0x20, 0xb9, 0xa7, 0xf2, 0x39, 0x82, 0xd9, 0x73, 0xc3,
-	0x3d, 0x67, 0x13, 0xad, 0xea, 0xec, 0x1b, 0xbd, 0x80, 0x7a, 0x97, 0x4f, 0xf2, 0x38, 0x72, 0x65,
-	0x98, 0x13, 0x74, 0xff, 0x24, 0xf8, 0x05, 0x54, 0xf8, 0x1c, 0x7e, 0xd3, 0x46, 0xe0, 0x5b, 0x30,
-	0x77, 0x68, 0x19, 0x43, 0xf7, 0xdc, 0x96, 0xd5, 0x8d, 0x4e, 0xba, 0x1e, 0xd0, 0xa6, 0xd2, 0xf8,
-	0x1c, 0xe6, 0x1c, 0x32, 0x30, 0x4c, 0xcb, 0xb4, 0xce, 0x8e, 0x4f, 0xae, 0x3c, 0xe2, 0x8a, 0x0b,
-	0x53, 0xcd, 0x27, 0xbf, 0xa5, 0x54, 0x6a, 0xda, 0x49, 0xdf, 0x3e, 0x11, 0x69, 0x8e, 0x7d, 0xe3,
-	0x5f, 0x68, 0x50, 0xf9, 0xdc, 0xf0, 0xba, 0x72, 0xe9, 0xd0, 0x36, 0xd4, 0xfc, 0xe4, 0xc6, 0x28,
-	0xc2, 0x96, 0x48, 0x89, 0x65, 0x63, 0xe4, 0x51, 0x5a, 0x56, 0xc7, 0x6a, 0x57, 0x25, 0x30, 0x51,
-	0x86, 0xd5, 0x25, 0x7d, 0x5f, 0x54, 0x26, 0x5d, 0x14, 0x63, 0x54, 0x45, 0xa9, 0x84, 0xb7, 0x73,
-	0xc1, 0xf1, 0x83, 0xe7, 0x92, 0x5f, 0x64, 0x00, 0xc5, 0x6d, 0xf8, 0x55, 0x4f, 0x64, 0x4f, 0xa1,
-	0xe6, 0x7a, 0x86, 0x13, 0xdb, 0x1b, 0x55, 0x46, 0xf5, 0x13, 0xf4, 0x73, 0x98, 0x1b, 0x3a, 0xf6,
-	0x99, 0x43, 0x5c, 0xf7, 0xd8, 0xb2, 0x3d, 0xf3, 0xf4, 0x4a, 0x1c, 0x6a, 0x6b, 0x92, 0xbc, 0xc7,
-	0xa8, 0xa8, 0x0d, 0x85, 0x53, 0xb3, 0xef, 0x11, 0xc7, 0x6d, 0xe4, 0x96, 0xb3, 0x2b, 0xb5, 0xb5,
-	0x57, 0xd7, 0x79, 0x6d, 0xf5, 0x7b, 0x8c, 0xbf, 0x73, 0x35, 0x24, 0xba, 0x1c, 0xab, 0x1e, 0x14,
-	0xf3, 0xa1, 0xc3, 0xf3, 0x22, 0x14, 0x3f, 0x52, 0x11, 0xf4, 0x52, 0x5c, 0xe0, 0x67, 0x3b, 0xd6,
-	0xde, 0xee, 0xe1, 0xa7, 0x00, 0x81, 0x28, 0x9a, 0x85, 0xf7, 0xf6, 0x0f, 0x8e, 0x3a, 0xf5, 0x19,
-	0x54, 0x81, 0xe2, 0xde, 0xfe, 0x66, 0x7b, 0xb7, 0x4d, 0x53, 0x36, 0x6e, 0x49, 0xb7, 0xa9, 0xee,
-	0x0d, 0xc9, 0xd5, 0xc2, 0x72, 0xff, 0x2a, 0x03, 0x55, 0xb1, 0x41, 0xa6, 0xda, 0xa5, 0xaa, 0x8a,
-	0x4c, 0x48, 0x05, 0x3d, 0xb0, 0xf2, 0x8d, 0xd3, 0x13, 0xe7, 0x62, 0xd9, 0xa4, 0x69, 0x83, 0xef,
-	0x03, 0xd2, 0x13, 0x1e, 0xf7, 0xdb, 0x89, 0x91, 0x9d, 0x4b, 0x8c, 0x6c, 0xf4, 0x18, 0xaa, 0xfe,
-	0x46, 0x34, 0x5c, 0x51, 0x86, 0x4b, 0x7a, 0x45, 0xee, 0x31, 0x4a, 0x43, 0x4f, 0x21, 0x4f, 0xc6,
-	0xc4, 0xf2, 0xdc, 0x46, 0x99, 0x25, 0xe4, 0xaa, 0x3c, 0x1a, 0xb7, 0x29, 0x55, 0x17, 0x9d, 0xf8,
-	0xb7, 0xe0, 0x16, 0xbb, 0x82, 0xbc, 0x73, 0x0c, 0x4b, 0xbd, 0x2b, 0x75, 0x3a, 0xbb, 0xc2, 0x75,
-	0xf4, 0x13, 0xd5, 0x20, 0xb3, 0xbd, 0x29, 0x26, 0x9a, 0xd9, 0xde, 0xc4, 0x3f, 0xd6, 0x00, 0xa9,
-	0xe3, 0xa6, 0xf2, 0x65, 0x44, 0xb8, 0x54, 0x9f, 0x0d, 0xd4, 0x2f, 0x40, 0x8e, 0x38, 0x8e, 0xed,
-	0x30, 0xaf, 0x95, 0x74, 0xde, 0xc0, 0x4f, 0x84, 0x0d, 0x3a, 0x19, 0xdb, 0x17, 0x7e, 0xcc, 0x70,
-	0x69, 0x9a, 0x6f, 0xea, 0x0e, 0xcc, 0x87, 0xb8, 0xa6, 0x2a, 0x0c, 0xcf, 0xe1, 0x36, 0x13, 0xb6,
-	0x43, 0xc8, 0x70, 0xbd, 0x6f, 0x8e, 0x53, 0xb5, 0x0e, 0xe1, 0x4e, 0x94, 0xf1, 0xab, 0xf5, 0x11,
-	0xfe, 0x5d, 0xa1, 0xb1, 0x63, 0x0e, 0x48, 0xc7, 0xde, 0x4d, 0xb7, 0x8d, 0x26, 0xce, 0x0b, 0x72,
-	0xe5, 0x8a, 0x0a, 0xca, 0xbe, 0xf1, 0x3f, 0x69, 0x70, 0x37, 0x36, 0xfc, 0x2b, 0x5e, 0xd5, 0x25,
-	0x80, 0x33, 0xba, 0x7d, 0x48, 0x8f, 0x76, 0xf0, 0xcb, 0xbb, 0x42, 0xf1, 0xed, 0xa4, 0xb9, 0xa7,
-	0x22, 0xec, 0x5c, 0x10, 0x6b, 0xce, 0xfe, 0xb8, 0xb2, 0xfc, 0x3c, 0x80, 0x32, 0x23, 0x1c, 0x7a,
-	0x86, 0x37, 0x72, 0x63, 0x8b, 0xf1, 0x27, 0x62, 0x0b, 0xc8, 0x41, 0x53, 0xcd, 0xeb, 0x9b, 0x90,
-	0x67, 0xe7, 0x56, 0x79, 0x6a, 0x8b, 0x5c, 0x14, 0x14, 0x3b, 0x74, 0xc1, 0x88, 0xcf, 0x21, 0xff,
-	0x9e, 0x81, 0x7d, 0x8a, 0x65, 0xb3, 0x72, 0x29, 0x2c, 0x63, 0xc0, 0x21, 0x88, 0x92, 0xce, 0xbe,
-	0xd9, 0x21, 0x87, 0x10, 0xe7, 0x48, 0xdf, 0xe5, 0x87, 0xa9, 0x92, 0xee, 0xb7, 0xa9, 0xcb, 0xba,
-	0x7d, 0x93, 0x58, 0x1e, 0xeb, 0x9d, 0x65, 0xbd, 0x0a, 0x05, 0xaf, 0x42, 0x9d, 0x6b, 0x5a, 0xef,
-	0xf5, 0x94, 0xc3, 0x8a, 0x2f, 0x4f, 0x0b, 0xcb, 0xc3, 0x3f, 0xd3, 0xe0, 0x96, 0x32, 0x60, 0x2a,
-	0xc7, 0xbc, 0x86, 0x3c, 0x87, 0x34, 0x45, 0x5d, 0x5c, 0x08, 0x8f, 0xe2, 0x6a, 0x74, 0xc1, 0x83,
-	0x56, 0xa1, 0xc0, 0xbf, 0xe4, 0x89, 0x31, 0x99, 0x5d, 0x32, 0xe1, 0xa7, 0x30, 0x2f, 0x48, 0x64,
-	0x60, 0x27, 0xed, 0x6d, 0xe6, 0x50, 0xfc, 0x23, 0x58, 0x08, 0xb3, 0x4d, 0x35, 0x25, 0xc5, 0xc8,
-	0xcc, 0x4d, 0x8c, 0x5c, 0x97, 0x46, 0x1e, 0x0d, 0x7b, 0x4a, 0x19, 0x8f, 0xae, 0xba, 0xba, 0x22,
-	0x99, 0xc8, 0x8a, 0xf8, 0x13, 0x90, 0x22, 0xbe, 0xd6, 0x09, 0xcc, 0xcb, 0xed, 0xb0, 0x6b, 0xba,
-	0xfe, 0xe1, 0xee, 0x13, 0x20, 0x95, 0xf8, 0x75, 0x1b, 0xb4, 0x49, 0x4e, 0x1d, 0xe3, 0x6c, 0x40,
-	0xfc, 0xfa, 0x44, 0x8f, 0xfa, 0x2a, 0x71, 0xaa, 0x8c, 0xde, 0x82, 0x5b, 0xef, 0xed, 0x31, 0x4d,
-	0x0d, 0x94, 0x1a, 0x84, 0x0c, 0xbf, 0xea, 0xf9, 0xcb, 0xe6, 0xb7, 0xa9, 0x72, 0x75, 0xc0, 0x54,
-	0xca, 0xff, 0x55, 0x83, 0xca, 0x7a, 0xdf, 0x70, 0x06, 0x52, 0xf1, 0x77, 0x20, 0xcf, 0x2f, 0x30,
-	0x02, 0x33, 0x78, 0x16, 0x16, 0xa3, 0xf2, 0xf2, 0xc6, 0x3a, 0xbf, 0xee, 0x88, 0x51, 0xd4, 0x70,
-	0xf1, 0xac, 0xb0, 0x19, 0x79, 0x66, 0xd8, 0x44, 0x9f, 0x41, 0xce, 0xa0, 0x43, 0x58, 0x0a, 0xae,
-	0x45, 0xaf, 0x8e, 0x4c, 0x1a, 0x3b, 0xb7, 0x71, 0x2e, 0xfc, 0x6d, 0x28, 0x2b, 0x1a, 0xe8, 0xe5,
-	0xf8, 0x5d, 0x5b, 0x1c, 0xc0, 0xd6, 0x37, 0x3a, 0xdb, 0x1f, 0xf8, 0x9d, 0xb9, 0x06, 0xb0, 0xd9,
-	0xf6, 0xdb, 0x19, 0xfc, 0x85, 0x18, 0x25, 0xf2, 0x9d, 0x6a, 0x8f, 0x96, 0x66, 0x4f, 0xe6, 0x46,
-	0xf6, 0x5c, 0x42, 0x55, 0x4c, 0x7f, 0xda, 0xf4, 0xcd, 0xe4, 0xa5, 0xa4, 0x6f, 0xc5, 0x78, 0x5d,
-	0x30, 0xe2, 0x39, 0xa8, 0x8a, 0x84, 0x2e, 0xf6, 0xdf, 0x5f, 0x67, 0xa0, 0x26, 0x29, 0xd3, 0x62,
-	0x9b, 0x12, 0x96, 0xe1, 0x15, 0xc0, 0x07, 0x65, 0xee, 0x40, 0xbe, 0x77, 0x72, 0x68, 0x7e, 0x92,
-	0x38, 0xb4, 0x68, 0x51, 0x7a, 0x9f, 0xeb, 0xe1, 0x8f, 0x41, 0xa2, 0x45, 0x2f, 0xe8, 0x8e, 0x71,
-	0xea, 0x6d, 0x5b, 0x3d, 0x72, 0xc9, 0xce, 0x8d, 0xb3, 0x7a, 0x40, 0x60, 0xf7, 0x55, 0xf1, 0x68,
-	0xc4, 0x0e, 0x8b, 0xca, 0x23, 0x12, 0x7a, 0x09, 0x75, 0xfa, 0xbd, 0x3e, 0x1c, 0xf6, 0x4d, 0xd2,
-	0xe3, 0x02, 0x0a, 0x8c, 0x27, 0x46, 0xa7, 0xda, 0xd9, 0xd1, 0xcb, 0x6d, 0x14, 0x59, 0xda, 0x12,
-	0x2d, 0x1a, 0xa5, 0xeb, 0x23, 0xef, 0xbc, 0x6d, 0x19, 0x27, 0x7d, 0x99, 0xf5, 0x68, 0xa9, 0xa6,
-	0xc4, 0x4d, 0xd3, 0x55, 0xa9, 0x6d, 0x98, 0xa7, 0x54, 0x62, 0x79, 0x66, 0x57, 0x49, 0x91, 0xb2,
-	0x10, 0x6a, 0x91, 0x42, 0x68, 0xb8, 0xee, 0x47, 0xdb, 0xe9, 0x09, 0xf7, 0xf8, 0x6d, 0xbc, 0xc9,
-	0x85, 0x1f, 0xb9, 0xa1, 0x52, 0xf7, 0xab, 0x4a, 0x59, 0x09, 0xa4, 0xbc, 0x23, 0xde, 0x04, 0x29,
-	0xf8, 0x15, 0xdc, 0x96, 0x9c, 0x02, 0x3b, 0x9c, 0xc0, 0xbc, 0x0f, 0x0f, 0x24, 0xf3, 0xc6, 0x39,
-	0xbd, 0x9c, 0x1d, 0x08, 0x85, 0xbf, 0xae, 0x9d, 0x6f, 0xa1, 0xe1, 0xdb, 0xc9, 0x0e, 0xdc, 0x76,
-	0x5f, 0x35, 0x60, 0xe4, 0x8a, 0x7d, 0x57, 0xd2, 0xd9, 0x37, 0xa5, 0x39, 0x76, 0xdf, 0x3f, 0x56,
-	0xd0, 0x6f, 0xbc, 0x01, 0x8b, 0x52, 0x86, 0x38, 0x0a, 0x87, 0x85, 0xc4, 0x0c, 0x4a, 0x12, 0x22,
-	0x1c, 0x46, 0x87, 0x4e, 0x76, 0xbb, 0xca, 0x19, 0x76, 0x2d, 0x93, 0xa9, 0x29, 0x32, 0x6f, 0xf3,
-	0x1d, 0x41, 0x0d, 0x53, 0xab, 0x8e, 0x20, 0x53, 0x01, 0x2a, 0x59, 0x2c, 0x04, 0x25, 0xc7, 0x16,
-	0x22, 0x26, 0xfa, 0x87, 0xb0, 0xe4, 0x1b, 0x41, 0xfd, 0x76, 0x40, 0x9c, 0x81, 0xe9, 0xba, 0x0a,
-	0xda, 0x94, 0x34, 0xf1, 0x67, 0x30, 0x3b, 0x24, 0x22, 0x2f, 0x95, 0xd7, 0xd0, 0x2a, 0x7f, 0x1e,
-	0x5e, 0x55, 0x06, 0xb3, 0x7e, 0xdc, 0x83, 0x87, 0x52, 0x3a, 0xf7, 0x68, 0xa2, 0xf8, 0xa8, 0x51,
-	0xf2, 0x52, 0xcf, 0xdd, 0x1a, 0xbf, 0xd4, 0x67, 0xf9, 0xda, 0xfb, 0x08, 0xe8, 0xf7, 0xb9, 0x23,
-	0x65, 0x6c, 0x4d, 0x55, 0x6f, 0x76, 0xb8, 0x4f, 0xfd, 0x90, 0x9c, 0x4a, 0xd8, 0x09, 0x2c, 0x84,
-	0x23, 0x79, 0xaa, 0x54, 0xb8, 0x00, 0x39, 0xcf, 0xbe, 0x20, 0x32, 0x11, 0xf2, 0x86, 0x34, 0xd8,
-	0x0f, 0xf3, 0xa9, 0x0c, 0x36, 0x02, 0x61, 0x6c, 0x4b, 0x4e, 0x6b, 0x2f, 0x5d, 0x4d, 0x79, 0x80,
-	0xe3, 0x0d, 0xbc, 0x07, 0x77, 0xa2, 0x69, 0x62, 0x2a, 0x93, 0x3f, 0xf0, 0x0d, 0x9c, 0x94, 0x49,
-	0xa6, 0x92, 0xfb, 0x83, 0x20, 0x19, 0x28, 0x09, 0x65, 0x2a, 0x91, 0x3a, 0x34, 0x93, 0xf2, 0xcb,
-	0x6f, 0x62, 0xbf, 0xfa, 0xe9, 0x66, 0x2a, 0x61, 0x6e, 0x20, 0x6c, 0xfa, 0xe5, 0x0f, 0x72, 0x44,
-	0x76, 0x62, 0x8e, 0x10, 0x41, 0x12, 0x64, 0xb1, 0xaf, 0x60, 0xd3, 0x09, 0x1d, 0x41, 0x02, 0x9d,
-	0x56, 0x07, 0xad, 0x21, 0xbe, 0x0e, 0xd6, 0x90, 0x1b, 0x5b, 0x4d, 0xbb, 0x53, 0x2d, 0xc6, 0xe7,
-	0x41, 0xee, 0x8c, 0x65, 0xe6, 0xa9, 0x04, 0x7f, 0x01, 0xcb, 0xe9, 0x49, 0x79, 0x1a, 0xc9, 0x2f,
-	0x5b, 0x50, 0xf2, 0x0f, 0xa5, 0xca, 0x4f, 0x2b, 0xca, 0x50, 0xd8, 0xdb, 0x3f, 0x3c, 0x58, 0xdf,
-	0x68, 0xf3, 0xdf, 0x56, 0x6c, 0xec, 0xeb, 0xfa, 0xd1, 0x41, 0xa7, 0x9e, 0x59, 0xfb, 0xdf, 0x2c,
-	0x64, 0x76, 0x3e, 0xa0, 0xdf, 0x87, 0x1c, 0x7f, 0x68, 0x9c, 0xf0, 0xba, 0xdc, 0x9c, 0xf4, 0x96,
-	0x8a, 0xef, 0xfd, 0xf8, 0xdf, 0xff, 0xeb, 0xa7, 0x99, 0xdb, 0xb8, 0xde, 0x1a, 0x7f, 0xeb, 0x84,
-	0x78, 0x46, 0xeb, 0x62, 0xdc, 0x62, 0xf5, 0xe1, 0x8d, 0xf6, 0x12, 0x1d, 0x41, 0xf6, 0x60, 0xe4,
-	0xa1, 0xd4, 0x97, 0xe7, 0x66, 0xfa, 0x13, 0x2b, 0x5e, 0x64, 0x82, 0xe7, 0x71, 0x4d, 0x11, 0x3c,
-	0x1c, 0x79, 0x54, 0xec, 0x08, 0xca, 0xea, 0x23, 0xe9, 0xb5, 0x4f, 0xd2, 0xcd, 0xeb, 0x1f, 0x60,
-	0xf1, 0x23, 0xa6, 0xee, 0x1e, 0xbe, 0xa3, 0xa8, 0xe3, 0x4f, 0xb9, 0xea, 0x6c, 0x3a, 0x97, 0x16,
-	0x4a, 0x7d, 0xb4, 0x6e, 0xa6, 0xbf, 0xcb, 0x26, 0xce, 0xc6, 0xbb, 0xb4, 0xa8, 0x58, 0x4b, 0x3c,
-	0xcb, 0x76, 0x3d, 0xf4, 0x30, 0xe1, 0x59, 0x4e, 0x7d, 0x80, 0x6a, 0x2e, 0xa7, 0x33, 0x08, 0x45,
-	0xcb, 0x4c, 0x51, 0x13, 0xdf, 0x56, 0x14, 0x75, 0x7d, 0xb6, 0x37, 0xda, 0xcb, 0xb5, 0x33, 0xc8,
-	0x31, 0x94, 0x19, 0xfd, 0x81, 0xfc, 0x68, 0x26, 0x40, 0xe7, 0x29, 0x8b, 0x1f, 0xc2, 0xa7, 0x71,
-	0x83, 0x29, 0x43, 0xb8, 0x2a, 0x95, 0x31, 0x9c, 0xf9, 0x8d, 0xf6, 0x72, 0x45, 0xfb, 0x86, 0xb6,
-	0xf6, 0x3f, 0xb3, 0x90, 0x63, 0x90, 0x13, 0xb2, 0x01, 0x02, 0x44, 0x36, 0x3a, 0xcb, 0x18, 0xc6,
-	0x1b, 0x9d, 0x65, 0x1c, 0xcc, 0xc5, 0x4b, 0x4c, 0x71, 0x03, 0xcf, 0x4b, 0xc5, 0x0c, 0xcd, 0x6a,
-	0x31, 0x80, 0x8e, 0xfa, 0x74, 0x2c, 0x40, 0x37, 0x1e, 0x66, 0x28, 0x49, 0x60, 0x08, 0x99, 0x8d,
-	0xee, 0x90, 0x04, 0x54, 0x16, 0x63, 0xa6, 0xf3, 0x3e, 0xbe, 0xab, 0x78, 0x96, 0xab, 0x75, 0x18,
-	0x23, 0xd5, 0xfb, 0x67, 0x1a, 0xd4, 0xc2, 0xd8, 0x2a, 0x7a, 0x9c, 0x20, 0x39, 0x0a, 0xd1, 0x36,
-	0x9f, 0x4c, 0x66, 0x4a, 0xb3, 0x80, 0xab, 0xbf, 0x20, 0x64, 0x68, 0x50, 0x46, 0xe1, 0x78, 0xf4,
-	0x17, 0x1a, 0xcc, 0x45, 0x00, 0x53, 0x94, 0xa4, 0x21, 0x06, 0xc7, 0x36, 0x9f, 0x5e, 0xc3, 0x25,
-	0x0c, 0x79, 0xc6, 0x0c, 0x59, 0xc6, 0xf7, 0x62, 0xae, 0xf0, 0xcc, 0x01, 0xf1, 0x6c, 0x61, 0x8c,
-	0xbf, 0x0c, 0x1c, 0xdc, 0x4c, 0x5c, 0x86, 0x10, 0x58, 0x9a, 0xb8, 0x0c, 0x61, 0x64, 0x74, 0xc2,
-	0x32, 0x70, 0x44, 0x93, 0x6e, 0xf1, 0xff, 0xcb, 0x42, 0x61, 0x83, 0xff, 0xc0, 0x11, 0xb9, 0x50,
-	0xf2, 0x51, 0x44, 0xb4, 0x94, 0x84, 0xe8, 0x04, 0xb7, 0x85, 0xe6, 0xc3, 0xd4, 0x7e, 0xa1, 0xfd,
-	0x29, 0xd3, 0xfe, 0x10, 0x37, 0xa5, 0x76, 0xf1, 0x3b, 0xca, 0x16, 0x87, 0x0e, 0x5a, 0x46, 0xaf,
-	0x47, 0x27, 0xfe, 0xa7, 0x50, 0x51, 0xa1, 0x3e, 0xf4, 0x28, 0x11, 0x49, 0x52, 0xd1, 0xc2, 0x26,
-	0x9e, 0xc4, 0x22, 0xb4, 0xaf, 0x30, 0xed, 0x18, 0x3f, 0x48, 0xd1, 0xee, 0x30, 0xf6, 0x90, 0x01,
-	0x1c, 0xaa, 0x4b, 0x36, 0x20, 0x84, 0x04, 0x26, 0x1b, 0x10, 0x46, 0xfa, 0xae, 0x35, 0x60, 0xc4,
-	0xd8, 0xa9, 0x01, 0x1f, 0x01, 0x02, 0x60, 0x0e, 0x25, 0xfa, 0x55, 0xb9, 0x3a, 0x45, 0x43, 0x3e,
-	0x8e, 0xe9, 0xc5, 0xf7, 0x5c, 0x44, 0x75, 0xdf, 0x74, 0x69, 0xe8, 0xaf, 0xfd, 0x2c, 0x0f, 0xe5,
-	0xf7, 0x86, 0x69, 0x79, 0xc4, 0x32, 0xac, 0x2e, 0x41, 0xa7, 0x90, 0x63, 0xa5, 0x31, 0x9a, 0xe5,
-	0x54, 0xbc, 0x2a, 0x9a, 0xe5, 0x42, 0x60, 0x0e, 0x7e, 0xc2, 0x34, 0x2f, 0xe1, 0x45, 0xa9, 0x79,
-	0x10, 0x88, 0x6f, 0x31, 0x1c, 0x86, 0x4e, 0xf8, 0x0f, 0x21, 0x2f, 0x20, 0xfe, 0x88, 0xb0, 0x10,
-	0x3e, 0xd3, 0xbc, 0x9f, 0xdc, 0x99, 0xb6, 0xbd, 0x54, 0x55, 0x2e, 0xe3, 0xa5, 0xba, 0x3e, 0x01,
-	0x04, 0x20, 0x63, 0xd4, 0xb9, 0x31, 0x4c, 0xb2, 0xb9, 0x9c, 0xce, 0x20, 0xf4, 0xbe, 0x60, 0x7a,
-	0x1f, 0xe3, 0xa5, 0x24, 0xbd, 0x3d, 0x9f, 0x9f, 0xea, 0x3e, 0x81, 0xd9, 0x2d, 0xc3, 0x3d, 0x47,
-	0x91, 0x62, 0xa7, 0xfc, 0x26, 0xa1, 0xd9, 0x4c, 0xea, 0x12, 0x9a, 0x1e, 0x33, 0x4d, 0x0f, 0x70,
-	0x23, 0x49, 0xd3, 0xb9, 0xe1, 0xd2, 0xea, 0x81, 0xce, 0x21, 0xcf, 0x7f, 0xa6, 0x10, 0xf5, 0x65,
-	0xe8, 0xa7, 0x0e, 0x51, 0x5f, 0x86, 0x7f, 0xd9, 0x70, 0x33, 0x4d, 0x1e, 0x14, 0xe5, 0x6f, 0x03,
-	0xd0, 0x83, 0xc8, 0xd2, 0x84, 0x7f, 0x47, 0xd0, 0x5c, 0x4a, 0xeb, 0x16, 0xfa, 0x9e, 0x33, 0x7d,
-	0x8f, 0xf0, 0xfd, 0xc4, 0xb5, 0x13, 0xdc, 0x6f, 0xb4, 0x97, 0xdf, 0xd0, 0x68, 0x99, 0x80, 0x00,
-	0xa8, 0x8d, 0x45, 0x47, 0x14, 0xf3, 0x8d, 0x45, 0x47, 0x0c, 0xe3, 0xc5, 0x6b, 0x4c, 0xf9, 0x6b,
-	0xfc, 0x3c, 0x49, 0xb9, 0xe7, 0x18, 0x96, 0x7b, 0x4a, 0x9c, 0xcf, 0x38, 0x20, 0xe7, 0x9e, 0x9b,
-	0x43, 0x1a, 0x29, 0xff, 0x3f, 0x07, 0xb3, 0xf4, 0x3c, 0x4a, 0xcb, 0x73, 0x70, 0x8d, 0x8f, 0x5a,
-	0x13, 0x03, 0xcf, 0xa2, 0xd6, 0xc4, 0x11, 0x80, 0x78, 0x79, 0x66, 0x3f, 0x65, 0x27, 0x8c, 0x89,
-	0x7a, 0xdd, 0x85, 0xb2, 0x72, 0xd7, 0x47, 0x09, 0x02, 0xc3, 0xc8, 0x5c, 0xb4, 0x2e, 0x24, 0x00,
-	0x05, 0xf8, 0x21, 0xd3, 0xb9, 0x88, 0x17, 0x42, 0x3a, 0x7b, 0x9c, 0x8b, 0x2a, 0xfd, 0x63, 0xa8,
-	0xa8, 0x98, 0x00, 0x4a, 0x90, 0x19, 0x41, 0xfe, 0xa2, 0x29, 0x31, 0x09, 0x52, 0x88, 0x67, 0x07,
-	0xff, 0x67, 0xfb, 0x92, 0x95, 0x2a, 0x1f, 0x42, 0x41, 0x00, 0x05, 0x49, 0xb3, 0x0d, 0x43, 0x85,
-	0x49, 0xb3, 0x8d, 0xa0, 0x0c, 0xf1, 0x63, 0x1e, 0xd3, 0x4a, 0xef, 0x43, 0xb2, 0x04, 0x09, 0x8d,
-	0xef, 0x88, 0x97, 0xa6, 0x31, 0xc0, 0xbe, 0xd2, 0x34, 0x2a, 0x77, 0xd1, 0x49, 0x1a, 0xcf, 0x88,
-	0x27, 0x62, 0x49, 0xde, 0xf3, 0x50, 0x8a, 0x40, 0x35, 0xe5, 0xe3, 0x49, 0x2c, 0x69, 0xa7, 0xf2,
-	0x40, 0xa9, 0xc8, 0xf7, 0xe8, 0x47, 0x00, 0x01, 0xa4, 0x11, 0x3d, 0x6d, 0x25, 0xe2, 0xa2, 0xd1,
-	0xd3, 0x56, 0x32, 0x2a, 0x12, 0xcf, 0x1f, 0x81, 0x6e, 0x7e, 0x31, 0xa0, 0xda, 0xff, 0x56, 0x03,
-	0x14, 0x47, 0x40, 0xd0, 0xab, 0x64, 0x0d, 0x89, 0x88, 0x6b, 0xf3, 0xf5, 0xcd, 0x98, 0xd3, 0x4a,
-	0x44, 0x60, 0x56, 0x97, 0x8d, 0x18, 0x7e, 0xa4, 0x86, 0xfd, 0x44, 0x83, 0x6a, 0x08, 0x42, 0x41,
-	0xcf, 0x52, 0xd6, 0x38, 0x02, 0xda, 0x36, 0x9f, 0x5f, 0xcb, 0x97, 0x76, 0x12, 0x53, 0x76, 0x84,
-	0x3c, 0x88, 0xff, 0xa5, 0x06, 0xb5, 0x30, 0xec, 0x82, 0x52, 0xe4, 0xc7, 0x80, 0xdf, 0xe6, 0xca,
-	0xf5, 0x8c, 0xd7, 0x2f, 0x55, 0x70, 0x36, 0x1f, 0x42, 0x41, 0x80, 0x35, 0x49, 0x01, 0x11, 0x86,
-	0x8d, 0x93, 0x02, 0x22, 0x82, 0xf4, 0xa4, 0x04, 0x84, 0x63, 0xf7, 0x89, 0x12, 0x82, 0x02, 0xd1,
-	0x49, 0xd3, 0x38, 0x39, 0x04, 0x23, 0x70, 0xd0, 0x24, 0x8d, 0x41, 0x08, 0x4a, 0x38, 0x07, 0xa5,
-	0x08, 0xbc, 0x26, 0x04, 0xa3, 0x68, 0x50, 0x4a, 0x08, 0x32, 0xa5, 0x4a, 0x08, 0x06, 0xe0, 0x4b,
-	0x52, 0x08, 0xc6, 0x10, 0xf1, 0xa4, 0x10, 0x8c, 0xe3, 0x37, 0x29, 0xeb, 0xca, 0x74, 0x87, 0x42,
-	0x70, 0x3e, 0x01, 0xab, 0x41, 0xaf, 0x53, 0x1c, 0x9a, 0x08, 0xb6, 0x37, 0x3f, 0xbb, 0x21, 0xf7,
-	0xc4, 0xbd, 0xcf, 0x97, 0x42, 0xee, 0xfd, 0x7f, 0xd0, 0x60, 0x21, 0x09, 0xeb, 0x41, 0x29, 0xba,
-	0x52, 0x80, 0xfa, 0xe6, 0xea, 0x4d, 0xd9, 0xaf, 0xf7, 0x9a, 0x1f, 0x0d, 0x6f, 0xeb, 0xff, 0xf2,
-	0xe5, 0x92, 0xf6, 0x6f, 0x5f, 0x2e, 0x69, 0xff, 0xf1, 0xe5, 0x92, 0xf6, 0x77, 0xff, 0xb9, 0x34,
-	0x73, 0x92, 0x67, 0xff, 0x81, 0xec, 0x5b, 0xbf, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xd7, 0x0c,
-	0xa4, 0xc7, 0x36, 0x00, 0x00,
+	// 3708 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5b, 0x5b, 0x6f, 0x1b, 0x49,
+	0x76, 0x56, 0x93, 0xe2, 0xed, 0xf0, 0x22, 0xba, 0x24, 0xdb, 0x34, 0x6d, 0xcb, 0x72, 0xf9, 0x26,
+	0x5f, 0x46, 0xdc, 0xd5, 0x6e, 0xf2, 0xe0, 0x04, 0x8b, 0x95, 0x25, 0xae, 0xa5, 0x95, 0x2c, 0x69,
+	0x5b, 0x94, 0x67, 0x02, 0x6c, 0x22, 0xb4, 0xc8, 0x92, 0xd4, 0x11, 0xd9, 0xcd, 0x74, 0x37, 0x69,
+	0xc9, 0x59, 0x24, 0xc0, 0x66, 0x13, 0xe4, 0x25, 0x79, 0xc8, 0x02, 0x41, 0x92, 0xd7, 0x20, 0x58,
+	0xec, 0x0f, 0x18, 0xe4, 0x2f, 0xe4, 0x2d, 0x01, 0xf2, 0x07, 0x82, 0x49, 0x5e, 0xf2, 0x0b, 0x72,
+	0x79, 0x5a, 0xd4, 0xad, 0xbb, 0xfa, 0x46, 0x69, 0x86, 0x33, 0xf3, 0x22, 0x77, 0x9d, 0x3a, 0x75,
+	0xce, 0xa9, 0x53, 0x75, 0xce, 0xa9, 0xfa, 0x8a, 0x86, 0x92, 0x33, 0xec, 0xae, 0x0c, 0x1d, 0xdb,
+	0xb3, 0x51, 0x85, 0x78, 0xdd, 0x9e, 0x4b, 0x9c, 0x31, 0x71, 0x86, 0xc7, 0xcd, 0x85, 0x53, 0xfb,
+	0xd4, 0x66, 0x1d, 0x2d, 0xfa, 0xc5, 0x79, 0x9a, 0x98, 0xf2, 0xb4, 0x4c, 0xcb, 0x23, 0x8e, 0x65,
+	0xf4, 0x5b, 0x83, 0x71, 0xb7, 0xcb, 0xfe, 0x0c, 0x8f, 0x5b, 0xe7, 0x63, 0xc1, 0x73, 0x97, 0xf1,
+	0x18, 0x23, 0xef, 0x8c, 0xfd, 0x19, 0x1e, 0xb3, 0x7f, 0x44, 0xe7, 0xbd, 0x53, 0xdb, 0x3e, 0xed,
+	0x93, 0x96, 0x31, 0x34, 0x5b, 0x86, 0x65, 0xd9, 0x9e, 0xe1, 0x99, 0xb6, 0xe5, 0xf2, 0x5e, 0xfc,
+	0xe7, 0x1a, 0xd4, 0x74, 0xe2, 0x0e, 0x6d, 0xcb, 0x25, 0x9b, 0xc4, 0xe8, 0x11, 0x07, 0xdd, 0x07,
+	0xe8, 0xf6, 0x47, 0xae, 0x47, 0x9c, 0x23, 0xb3, 0xd7, 0xd0, 0x96, 0xb4, 0xe5, 0x59, 0xbd, 0x24,
+	0x28, 0x5b, 0x3d, 0x74, 0x17, 0x4a, 0x03, 0x32, 0x38, 0xe6, 0xbd, 0x19, 0xd6, 0x5b, 0xe4, 0x84,
+	0xad, 0x1e, 0x6a, 0x42, 0xd1, 0x21, 0x63, 0xd3, 0x35, 0x6d, 0xab, 0x91, 0x5d, 0xd2, 0x96, 0xb3,
+	0xba, 0xdf, 0xa6, 0x03, 0x1d, 0xe3, 0xc4, 0x3b, 0xf2, 0x88, 0x33, 0x68, 0xcc, 0xf2, 0x81, 0x94,
+	0xd0, 0x21, 0xce, 0x00, 0xff, 0x22, 0x07, 0x15, 0xdd, 0xb0, 0x4e, 0x89, 0x4e, 0xfe, 0x68, 0x44,
+	0x5c, 0x0f, 0xd5, 0x21, 0x7b, 0x4e, 0x2e, 0x99, 0xfa, 0x8a, 0x4e, 0x3f, 0xf9, 0x78, 0xeb, 0x94,
+	0x1c, 0x11, 0x8b, 0x2b, 0xae, 0xd0, 0xf1, 0xd6, 0x29, 0x69, 0x5b, 0x3d, 0xb4, 0x00, 0xb9, 0xbe,
+	0x39, 0x30, 0x3d, 0xa1, 0x95, 0x37, 0x42, 0xe6, 0xcc, 0x46, 0xcc, 0x59, 0x07, 0x70, 0x6d, 0xc7,
+	0x3b, 0xb2, 0x9d, 0x1e, 0x71, 0x1a, 0xb9, 0x25, 0x6d, 0xb9, 0xb6, 0xfa, 0x78, 0x45, 0x5d, 0x91,
+	0x15, 0xd5, 0xa0, 0x95, 0x03, 0xdb, 0xf1, 0xf6, 0x28, 0xaf, 0x5e, 0x72, 0xe5, 0x27, 0xfa, 0x11,
+	0x94, 0x99, 0x10, 0xcf, 0x70, 0x4e, 0x89, 0xd7, 0xc8, 0x33, 0x29, 0x4f, 0xae, 0x90, 0xd2, 0x61,
+	0xcc, 0x3a, 0x53, 0xcf, 0xbf, 0x11, 0x86, 0x8a, 0x4b, 0x1c, 0xd3, 0xe8, 0x9b, 0x1f, 0x8d, 0xe3,
+	0x3e, 0x69, 0x14, 0x96, 0xb4, 0xe5, 0xa2, 0x1e, 0xa2, 0xd1, 0xf9, 0x9f, 0x93, 0x4b, 0xf7, 0xc8,
+	0xb6, 0xfa, 0x97, 0x8d, 0x22, 0x63, 0x28, 0x52, 0xc2, 0x9e, 0xd5, 0xbf, 0x64, 0x8b, 0x66, 0x8f,
+	0x2c, 0x8f, 0xf7, 0x96, 0x58, 0x6f, 0x89, 0x51, 0x58, 0xf7, 0x32, 0xd4, 0x07, 0xa6, 0x75, 0x34,
+	0xb0, 0x7b, 0x47, 0xbe, 0x43, 0x80, 0x39, 0xa4, 0x36, 0x30, 0xad, 0x77, 0x76, 0x4f, 0x97, 0x6e,
+	0xa1, 0x9c, 0xc6, 0x45, 0x98, 0xb3, 0x2c, 0x38, 0x8d, 0x0b, 0x95, 0x73, 0x05, 0xe6, 0xa9, 0xcc,
+	0xae, 0x43, 0x0c, 0x8f, 0x04, 0xcc, 0x15, 0xc6, 0x7c, 0x63, 0x60, 0x5a, 0xeb, 0xac, 0x27, 0xc4,
+	0x6f, 0x5c, 0xc4, 0xf8, 0xab, 0x82, 0xdf, 0xb8, 0x08, 0xf3, 0xe3, 0x15, 0x28, 0xf9, 0x3e, 0x47,
+	0x45, 0x98, 0xdd, 0xdd, 0xdb, 0x6d, 0xd7, 0x67, 0x10, 0x40, 0x7e, 0xed, 0x60, 0xbd, 0xbd, 0xbb,
+	0x51, 0xd7, 0x50, 0x19, 0x0a, 0x1b, 0x6d, 0xde, 0xc8, 0xe0, 0x37, 0x00, 0x81, 0x77, 0x51, 0x01,
+	0xb2, 0xdb, 0xed, 0xdf, 0xab, 0xcf, 0x50, 0x9e, 0xf7, 0x6d, 0xfd, 0x60, 0x6b, 0x6f, 0xb7, 0xae,
+	0xd1, 0xc1, 0xeb, 0x7a, 0x7b, 0xad, 0xd3, 0xae, 0x67, 0x28, 0xc7, 0xbb, 0xbd, 0x8d, 0x7a, 0x16,
+	0x95, 0x20, 0xf7, 0x7e, 0x6d, 0xe7, 0xb0, 0x5d, 0x9f, 0xc5, 0xbf, 0xd4, 0xa0, 0x2a, 0xd6, 0x8b,
+	0xc7, 0x04, 0xfa, 0x3e, 0xe4, 0xcf, 0x58, 0x5c, 0xb0, 0xad, 0x58, 0x5e, 0xbd, 0x17, 0x59, 0xdc,
+	0x50, 0xec, 0xe8, 0x82, 0x17, 0x61, 0xc8, 0x9e, 0x8f, 0xdd, 0x46, 0x66, 0x29, 0xbb, 0x5c, 0x5e,
+	0xad, 0xaf, 0xf0, 0x80, 0x5d, 0xd9, 0x26, 0x97, 0xef, 0x8d, 0xfe, 0x88, 0xe8, 0xb4, 0x13, 0x21,
+	0x98, 0x1d, 0xd8, 0x0e, 0x61, 0x3b, 0xb6, 0xa8, 0xb3, 0x6f, 0xba, 0x8d, 0xd9, 0xa2, 0x89, 0xdd,
+	0xca, 0x1b, 0xf8, 0xd7, 0x1a, 0xc0, 0xfe, 0xc8, 0x4b, 0x0f, 0x8d, 0x05, 0xc8, 0x8d, 0xa9, 0x60,
+	0x11, 0x16, 0xbc, 0xc1, 0x62, 0x82, 0x18, 0x2e, 0xf1, 0x63, 0x82, 0x36, 0xd0, 0x6d, 0x28, 0x0c,
+	0x1d, 0x32, 0x3e, 0x3a, 0x1f, 0x33, 0x25, 0x45, 0x3d, 0x4f, 0x9b, 0xdb, 0x63, 0xf4, 0x10, 0x2a,
+	0xe6, 0xa9, 0x65, 0x3b, 0xe4, 0x88, 0xcb, 0xca, 0xb1, 0xde, 0x32, 0xa7, 0x31, 0xbb, 0x15, 0x16,
+	0x2e, 0x38, 0xaf, 0xb2, 0xec, 0x50, 0x12, 0xb6, 0xa0, 0xcc, 0x4c, 0x9d, 0xca, 0x7d, 0xcf, 0x03,
+	0x1b, 0x33, 0x6c, 0x58, 0xdc, 0x85, 0xc2, 0x6a, 0xfc, 0x53, 0x40, 0x1b, 0xa4, 0x4f, 0x3c, 0x32,
+	0x4d, 0xf6, 0x50, 0x7c, 0x92, 0x55, 0x7d, 0x82, 0xff, 0x46, 0x83, 0xf9, 0x90, 0xf8, 0xa9, 0xa6,
+	0xd5, 0x80, 0x42, 0x8f, 0x09, 0xe3, 0x16, 0x64, 0x75, 0xd9, 0x44, 0x2f, 0xa1, 0x28, 0x0c, 0x70,
+	0x1b, 0xd9, 0x94, 0x4d, 0x53, 0xe0, 0x36, 0xb9, 0xf8, 0xd7, 0x19, 0x28, 0x89, 0x89, 0xee, 0x0d,
+	0xd1, 0x1a, 0x54, 0x1d, 0xde, 0x38, 0x62, 0xf3, 0x11, 0x16, 0x35, 0xd3, 0x93, 0xd0, 0xe6, 0x8c,
+	0x5e, 0x11, 0x43, 0x18, 0x19, 0xfd, 0x0e, 0x94, 0xa5, 0x88, 0xe1, 0xc8, 0x13, 0x2e, 0x6f, 0x84,
+	0x05, 0x04, 0xfb, 0x6f, 0x73, 0x46, 0x07, 0xc1, 0xbe, 0x3f, 0xf2, 0x50, 0x07, 0x16, 0xe4, 0x60,
+	0x3e, 0x1b, 0x61, 0x46, 0x96, 0x49, 0x59, 0x0a, 0x4b, 0x89, 0x2f, 0xd5, 0xe6, 0x8c, 0x8e, 0xc4,
+	0x78, 0xa5, 0x53, 0x35, 0xc9, 0xbb, 0xe0, 0xc9, 0x3b, 0x66, 0x52, 0xe7, 0xc2, 0x8a, 0x9b, 0xd4,
+	0xb9, 0xb0, 0xde, 0x94, 0xa0, 0x20, 0x5a, 0xf8, 0x9f, 0x33, 0x00, 0x72, 0x35, 0xf6, 0x86, 0x68,
+	0x03, 0x6a, 0x8e, 0x68, 0x85, 0xbc, 0x75, 0x37, 0xd1, 0x5b, 0x62, 0x11, 0x67, 0xf4, 0xaa, 0x1c,
+	0xc4, 0x8d, 0xfb, 0x01, 0x54, 0x7c, 0x29, 0x81, 0xc3, 0xee, 0x24, 0x38, 0xcc, 0x97, 0x50, 0x96,
+	0x03, 0xa8, 0xcb, 0x3e, 0x85, 0x9b, 0xfe, 0xf8, 0x04, 0x9f, 0x3d, 0x9c, 0xe0, 0x33, 0x5f, 0xe0,
+	0xbc, 0x94, 0xa0, 0x7a, 0x4d, 0x35, 0x2c, 0x70, 0xdb, 0x9d, 0x04, 0xb7, 0xc5, 0x0d, 0xa3, 0x8e,
+	0x03, 0x5a, 0x2f, 0x79, 0x13, 0xff, 0x77, 0x16, 0x0a, 0xeb, 0xf6, 0x60, 0x68, 0x38, 0x74, 0x35,
+	0xf2, 0x0e, 0x71, 0x47, 0x7d, 0x8f, 0xb9, 0xab, 0xb6, 0xfa, 0x28, 0x2c, 0x51, 0xb0, 0xc9, 0x7f,
+	0x75, 0xc6, 0xaa, 0x8b, 0x21, 0x74, 0xb0, 0x28, 0x8f, 0x99, 0x6b, 0x0c, 0x16, 0xc5, 0x51, 0x0c,
+	0x91, 0x81, 0x9c, 0x0d, 0x02, 0xb9, 0x09, 0x85, 0x31, 0x71, 0x82, 0x92, 0xbe, 0x39, 0xa3, 0x4b,
+	0x02, 0x7a, 0x0e, 0x73, 0xd1, 0xf2, 0x92, 0x13, 0x3c, 0xb5, 0x6e, 0xb8, 0x1a, 0x3d, 0x82, 0x4a,
+	0xa8, 0xc6, 0xe5, 0x05, 0x5f, 0x79, 0xa0, 0x94, 0xb8, 0x5b, 0x32, 0xaf, 0xd2, 0x7a, 0x5c, 0xd9,
+	0x9c, 0x91, 0x99, 0xf5, 0x96, 0xcc, 0xac, 0x45, 0x31, 0x4a, 0xe4, 0xd6, 0x50, 0x92, 0xf9, 0x61,
+	0x38, 0xc9, 0xe0, 0x1f, 0x42, 0x35, 0xe4, 0x20, 0x5a, 0x77, 0xda, 0x3f, 0x39, 0x5c, 0xdb, 0xe1,
+	0x45, 0xea, 0x2d, 0xab, 0x4b, 0x7a, 0x5d, 0xa3, 0xb5, 0x6e, 0xa7, 0x7d, 0x70, 0x50, 0xcf, 0xa0,
+	0x2a, 0x94, 0x76, 0xf7, 0x3a, 0x47, 0x9c, 0x2b, 0x8b, 0xdf, 0xfa, 0x12, 0x44, 0x91, 0x53, 0x6a,
+	0xdb, 0x8c, 0x52, 0xdb, 0x34, 0x59, 0xdb, 0x32, 0x41, 0x6d, 0x63, 0x65, 0x6e, 0xa7, 0xbd, 0x76,
+	0xd0, 0xae, 0xcf, 0xbe, 0xa9, 0x41, 0x85, 0xfb, 0xf7, 0x68, 0x64, 0xd1, 0x52, 0xfb, 0x8f, 0x1a,
+	0x40, 0x10, 0x4d, 0xa8, 0x05, 0x85, 0x2e, 0xd7, 0xd3, 0xd0, 0x58, 0x32, 0xba, 0x99, 0xb8, 0x64,
+	0xba, 0xe4, 0x42, 0xdf, 0x85, 0x82, 0x3b, 0xea, 0x76, 0x89, 0x2b, 0x4b, 0xde, 0xed, 0x68, 0x3e,
+	0x14, 0xd9, 0x4a, 0x97, 0x7c, 0x74, 0xc8, 0x89, 0x61, 0xf6, 0x47, 0xac, 0x00, 0x4e, 0x1e, 0x22,
+	0xf8, 0xf0, 0xdf, 0x6b, 0x50, 0x56, 0x36, 0xef, 0x57, 0x4c, 0xc2, 0xf7, 0xa0, 0xc4, 0x6c, 0x20,
+	0x3d, 0x91, 0x86, 0x8b, 0x7a, 0x40, 0x40, 0xbf, 0x0d, 0x25, 0x19, 0x01, 0x32, 0x13, 0x37, 0x92,
+	0xc5, 0xee, 0x0d, 0xf5, 0x80, 0x15, 0x6f, 0xc3, 0x0d, 0xe6, 0x95, 0x2e, 0x3d, 0x5c, 0x4b, 0x3f,
+	0xaa, 0xc7, 0x4f, 0x2d, 0x72, 0xfc, 0x6c, 0x42, 0x71, 0x78, 0x76, 0xe9, 0x9a, 0x5d, 0xa3, 0x2f,
+	0xac, 0xf0, 0xdb, 0xf8, 0xc7, 0x80, 0x54, 0x61, 0xd3, 0x4c, 0x17, 0x57, 0xa1, 0xbc, 0x69, 0xb8,
+	0x67, 0xc2, 0x24, 0xfc, 0x12, 0xaa, 0xb4, 0xb9, 0xfd, 0xfe, 0x1a, 0x36, 0xb2, 0xcb, 0x81, 0xe4,
+	0x9e, 0xca, 0xe7, 0x08, 0x66, 0xcf, 0x0c, 0xf7, 0x8c, 0x4d, 0xb4, 0xaa, 0xb3, 0x6f, 0xf4, 0x1c,
+	0xea, 0x5d, 0x3e, 0xc9, 0xa3, 0xc8, 0x95, 0x61, 0x4e, 0xd0, 0xfd, 0x93, 0xe0, 0x67, 0x50, 0xe1,
+	0x73, 0xf8, 0xba, 0x8d, 0xc0, 0x37, 0x60, 0xee, 0xc0, 0x32, 0x86, 0xee, 0x99, 0x2d, 0xab, 0x1b,
+	0x9d, 0x74, 0x3d, 0xa0, 0x4d, 0xa5, 0xf1, 0x19, 0xcc, 0x39, 0x64, 0x60, 0x98, 0x96, 0x69, 0x9d,
+	0x1e, 0x1d, 0x5f, 0x7a, 0xc4, 0x15, 0x17, 0xa6, 0x9a, 0x4f, 0x7e, 0x43, 0xa9, 0xd4, 0xb4, 0xe3,
+	0xbe, 0x7d, 0x2c, 0xd2, 0x1c, 0xfb, 0xc6, 0x9f, 0x6b, 0x50, 0xf9, 0xd4, 0xf0, 0xba, 0x72, 0xe9,
+	0xd0, 0x16, 0xd4, 0xfc, 0xe4, 0xc6, 0x28, 0xc2, 0x96, 0x48, 0x89, 0x65, 0x63, 0xe4, 0x51, 0x5a,
+	0x56, 0xc7, 0x6a, 0x57, 0x25, 0x30, 0x51, 0x86, 0xd5, 0x25, 0x7d, 0x5f, 0x54, 0x26, 0x5d, 0x14,
+	0x63, 0x54, 0x45, 0xa9, 0x84, 0x37, 0x73, 0xc1, 0xf1, 0x83, 0xe7, 0x92, 0xcf, 0x33, 0x80, 0xe2,
+	0x36, 0x7c, 0xd9, 0x13, 0xd9, 0x13, 0xa8, 0xb9, 0x9e, 0xe1, 0xc4, 0xf6, 0x46, 0x95, 0x51, 0xfd,
+	0x04, 0xfd, 0x0c, 0xe6, 0x86, 0x8e, 0x7d, 0xea, 0x10, 0xd7, 0x3d, 0xb2, 0x6c, 0xcf, 0x3c, 0xb9,
+	0x14, 0x87, 0xda, 0x9a, 0x24, 0xef, 0x32, 0x2a, 0x6a, 0x43, 0xe1, 0xc4, 0xec, 0x7b, 0xc4, 0x71,
+	0x1b, 0xb9, 0xa5, 0xec, 0x72, 0x6d, 0xf5, 0xe5, 0x55, 0x5e, 0x5b, 0xf9, 0x11, 0xe3, 0xef, 0x5c,
+	0x0e, 0x89, 0x2e, 0xc7, 0xaa, 0x07, 0xc5, 0x7c, 0xe8, 0xf0, 0x7c, 0x07, 0x8a, 0x1f, 0xa8, 0x08,
+	0x7a, 0x29, 0x2e, 0xf0, 0xb3, 0x1d, 0x6b, 0x6f, 0xf5, 0xf0, 0x13, 0x80, 0x40, 0x14, 0xcd, 0xc2,
+	0xbb, 0x7b, 0xfb, 0x87, 0x9d, 0xfa, 0x0c, 0xaa, 0x40, 0x71, 0x77, 0x6f, 0xa3, 0xbd, 0xd3, 0xa6,
+	0x29, 0x1b, 0xb7, 0xa4, 0xdb, 0x54, 0xf7, 0x86, 0xe4, 0x6a, 0x61, 0xb9, 0x7f, 0x95, 0x81, 0xaa,
+	0xd8, 0x20, 0x53, 0xed, 0x52, 0x55, 0x45, 0x26, 0xa4, 0x82, 0x1e, 0x58, 0xf9, 0xc6, 0xe9, 0x89,
+	0x73, 0xb1, 0x6c, 0xd2, 0xb4, 0xc1, 0xf7, 0x01, 0xe9, 0x09, 0x8f, 0xfb, 0xed, 0xc4, 0xc8, 0xce,
+	0x25, 0x46, 0x36, 0x7a, 0x04, 0x55, 0x7f, 0x23, 0x1a, 0xae, 0x28, 0xc3, 0x25, 0xbd, 0x22, 0xf7,
+	0x18, 0xa5, 0xa1, 0x27, 0x90, 0x27, 0x63, 0x62, 0x79, 0x6e, 0xa3, 0xcc, 0x12, 0x72, 0x55, 0x1e,
+	0x8d, 0xdb, 0x94, 0xaa, 0x8b, 0x4e, 0xfc, 0x5b, 0x70, 0x83, 0x5d, 0x41, 0xde, 0x3a, 0x86, 0xa5,
+	0xde, 0x95, 0x3a, 0x9d, 0x1d, 0xe1, 0x3a, 0xfa, 0x89, 0x6a, 0x90, 0xd9, 0xda, 0x10, 0x13, 0xcd,
+	0x6c, 0x6d, 0xe0, 0x9f, 0x6b, 0x80, 0xd4, 0x71, 0x53, 0xf9, 0x32, 0x22, 0x5c, 0xaa, 0xcf, 0x06,
+	0xea, 0x17, 0x20, 0x47, 0x1c, 0xc7, 0x76, 0x98, 0xd7, 0x4a, 0x3a, 0x6f, 0xe0, 0xc7, 0xc2, 0x06,
+	0x9d, 0x8c, 0xed, 0x73, 0x3f, 0x66, 0xb8, 0x34, 0xcd, 0x37, 0x75, 0x1b, 0xe6, 0x43, 0x5c, 0x53,
+	0x15, 0x86, 0x67, 0x70, 0x93, 0x09, 0xdb, 0x26, 0x64, 0xb8, 0xd6, 0x37, 0xc7, 0xa9, 0x5a, 0x87,
+	0x70, 0x2b, 0xca, 0xf8, 0xcd, 0xfa, 0x08, 0xff, 0xae, 0xd0, 0xd8, 0x31, 0x07, 0xa4, 0x63, 0xef,
+	0xa4, 0xdb, 0x46, 0x13, 0xe7, 0x39, 0xb9, 0x74, 0x45, 0x05, 0x65, 0xdf, 0xf8, 0x9f, 0x34, 0xb8,
+	0x1d, 0x1b, 0xfe, 0x0d, 0xaf, 0xea, 0x22, 0xc0, 0x29, 0xdd, 0x3e, 0xa4, 0x47, 0x3b, 0xf8, 0xe5,
+	0x5d, 0xa1, 0xf8, 0x76, 0xd2, 0xdc, 0x53, 0x11, 0x76, 0x2e, 0x88, 0x35, 0x67, 0x7f, 0x5c, 0x59,
+	0x7e, 0xee, 0x43, 0x99, 0x11, 0x0e, 0x3c, 0xc3, 0x1b, 0xb9, 0xb1, 0xc5, 0xf8, 0x13, 0xb1, 0x05,
+	0xe4, 0xa0, 0xa9, 0xe6, 0xf5, 0x5d, 0xc8, 0xb3, 0x73, 0xab, 0x3c, 0xb5, 0x45, 0x2e, 0x0a, 0x8a,
+	0x1d, 0xba, 0x60, 0xc4, 0x67, 0x90, 0x7f, 0xc7, 0xc0, 0x3e, 0xc5, 0xb2, 0x59, 0xb9, 0x14, 0x96,
+	0x31, 0xe0, 0x10, 0x44, 0x49, 0x67, 0xdf, 0xec, 0x90, 0x43, 0x88, 0x73, 0xa8, 0xef, 0xf0, 0xc3,
+	0x54, 0x49, 0xf7, 0xdb, 0xd4, 0x65, 0xdd, 0xbe, 0x49, 0x2c, 0x8f, 0xf5, 0xce, 0xb2, 0x5e, 0x85,
+	0x82, 0x57, 0xa0, 0xce, 0x35, 0xad, 0xf5, 0x7a, 0xca, 0x61, 0xc5, 0x97, 0xa7, 0x85, 0xe5, 0xe1,
+	0x5f, 0x69, 0x70, 0x43, 0x19, 0x30, 0x95, 0x63, 0x5e, 0x41, 0x9e, 0x43, 0x9a, 0xa2, 0x2e, 0x2e,
+	0x84, 0x47, 0x71, 0x35, 0xba, 0xe0, 0x41, 0x2b, 0x50, 0xe0, 0x5f, 0xf2, 0xc4, 0x98, 0xcc, 0x2e,
+	0x99, 0xf0, 0x13, 0x98, 0x17, 0x24, 0x32, 0xb0, 0x93, 0xf6, 0x36, 0x73, 0x28, 0xfe, 0x19, 0x2c,
+	0x84, 0xd9, 0xa6, 0x9a, 0x92, 0x62, 0x64, 0xe6, 0x3a, 0x46, 0xae, 0x49, 0x23, 0x0f, 0x87, 0x3d,
+	0xa5, 0x8c, 0x47, 0x57, 0x5d, 0x5d, 0x91, 0x4c, 0x64, 0x45, 0xfc, 0x09, 0x48, 0x11, 0xdf, 0xea,
+	0x04, 0xe6, 0xe5, 0x76, 0xd8, 0x31, 0x5d, 0xff, 0x70, 0xf7, 0x11, 0x90, 0x4a, 0xfc, 0xb6, 0x0d,
+	0xda, 0x20, 0x27, 0x8e, 0x71, 0x3a, 0x20, 0x7e, 0x7d, 0xa2, 0x47, 0x7d, 0x95, 0x38, 0x55, 0x46,
+	0x6f, 0xc1, 0x8d, 0x77, 0xf6, 0x98, 0xa6, 0x06, 0x4a, 0x0d, 0x42, 0x86, 0x5f, 0xf5, 0xfc, 0x65,
+	0xf3, 0xdb, 0x54, 0xb9, 0x3a, 0x60, 0x2a, 0xe5, 0xff, 0xaa, 0x41, 0x65, 0xad, 0x6f, 0x38, 0x03,
+	0xa9, 0xf8, 0x07, 0x90, 0xe7, 0x17, 0x18, 0x81, 0x19, 0x3c, 0x0d, 0x8b, 0x51, 0x79, 0x79, 0x63,
+	0x8d, 0x5f, 0x77, 0xc4, 0x28, 0x6a, 0xb8, 0x78, 0x56, 0xd8, 0x88, 0x3c, 0x33, 0x6c, 0xa0, 0x4f,
+	0x20, 0x67, 0xd0, 0x21, 0x2c, 0x05, 0xd7, 0xa2, 0x57, 0x47, 0x26, 0x8d, 0x9d, 0xdb, 0x38, 0x17,
+	0xfe, 0x3e, 0x94, 0x15, 0x0d, 0xf4, 0x72, 0xfc, 0xb6, 0x2d, 0x0e, 0x60, 0x6b, 0xeb, 0x9d, 0xad,
+	0xf7, 0xfc, 0xce, 0x5c, 0x03, 0xd8, 0x68, 0xfb, 0xed, 0x0c, 0xfe, 0x4c, 0x8c, 0x12, 0xf9, 0x4e,
+	0xb5, 0x47, 0x4b, 0xb3, 0x27, 0x73, 0x2d, 0x7b, 0x2e, 0xa0, 0x2a, 0xa6, 0x3f, 0x6d, 0xfa, 0x66,
+	0xf2, 0x52, 0xd2, 0xb7, 0x62, 0xbc, 0x2e, 0x18, 0xf1, 0x1c, 0x54, 0x45, 0x42, 0x17, 0xfb, 0xef,
+	0xaf, 0x33, 0x50, 0x93, 0x94, 0x69, 0xb1, 0x4d, 0x09, 0xcb, 0xf0, 0x0a, 0xe0, 0x83, 0x32, 0xb7,
+	0x20, 0xdf, 0x3b, 0x3e, 0x30, 0x3f, 0x4a, 0x1c, 0x5a, 0xb4, 0x28, 0xbd, 0xcf, 0xf5, 0xf0, 0xc7,
+	0x20, 0xd1, 0xa2, 0x17, 0x74, 0xc7, 0x38, 0xf1, 0xb6, 0xac, 0x1e, 0xb9, 0x60, 0xe7, 0xc6, 0x59,
+	0x3d, 0x20, 0xb0, 0xfb, 0xaa, 0x78, 0x34, 0x62, 0x87, 0x45, 0xe5, 0x11, 0x09, 0xbd, 0x80, 0x3a,
+	0xfd, 0x5e, 0x1b, 0x0e, 0xfb, 0x26, 0xe9, 0x71, 0x01, 0x05, 0xc6, 0x13, 0xa3, 0x53, 0xed, 0xec,
+	0xe8, 0xe5, 0x36, 0x8a, 0x2c, 0x6d, 0x89, 0x16, 0x8d, 0xd2, 0xb5, 0x91, 0x77, 0xd6, 0xb6, 0x8c,
+	0xe3, 0xbe, 0xcc, 0x7a, 0xb4, 0x54, 0x53, 0xe2, 0x86, 0xe9, 0xaa, 0xd4, 0x36, 0xcc, 0x53, 0x2a,
+	0xb1, 0x3c, 0xb3, 0xab, 0xa4, 0x48, 0x59, 0x08, 0xb5, 0x48, 0x21, 0x34, 0x5c, 0xf7, 0x83, 0xed,
+	0xf4, 0x84, 0x7b, 0xfc, 0x36, 0xde, 0xe0, 0xc2, 0x0f, 0xdd, 0x50, 0xa9, 0xfb, 0xb2, 0x52, 0x96,
+	0x03, 0x29, 0x6f, 0x89, 0x37, 0x41, 0x0a, 0x7e, 0x09, 0x37, 0x25, 0xa7, 0xc0, 0x0e, 0x27, 0x30,
+	0xef, 0xc1, 0x7d, 0xc9, 0xbc, 0x7e, 0x46, 0x2f, 0x67, 0xfb, 0x42, 0xe1, 0x57, 0xb5, 0xf3, 0x0d,
+	0x34, 0x7c, 0x3b, 0xd9, 0x81, 0xdb, 0xee, 0xab, 0x06, 0x8c, 0x5c, 0xb1, 0xef, 0x4a, 0x3a, 0xfb,
+	0xa6, 0x34, 0xc7, 0xee, 0xfb, 0xc7, 0x0a, 0xfa, 0x8d, 0xd7, 0xe1, 0x8e, 0x94, 0x21, 0x8e, 0xc2,
+	0x61, 0x21, 0x31, 0x83, 0x92, 0x84, 0x08, 0x87, 0xd1, 0xa1, 0x93, 0xdd, 0xae, 0x72, 0x86, 0x5d,
+	0xcb, 0x64, 0x6a, 0x8a, 0xcc, 0x9b, 0x7c, 0x47, 0x50, 0xc3, 0xd4, 0xaa, 0x23, 0xc8, 0x54, 0x80,
+	0x4a, 0x16, 0x0b, 0x41, 0xc9, 0xb1, 0x85, 0x88, 0x89, 0xfe, 0x29, 0x2c, 0xfa, 0x46, 0x50, 0xbf,
+	0xed, 0x13, 0x67, 0x60, 0xba, 0xae, 0x82, 0x36, 0x25, 0x4d, 0xfc, 0x29, 0xcc, 0x0e, 0x89, 0xc8,
+	0x4b, 0xe5, 0x55, 0xb4, 0xc2, 0x9f, 0x87, 0x57, 0x94, 0xc1, 0xac, 0x1f, 0xf7, 0xe0, 0x81, 0x94,
+	0xce, 0x3d, 0x9a, 0x28, 0x3e, 0x6a, 0x94, 0xbc, 0xd4, 0x73, 0xb7, 0xc6, 0x2f, 0xf5, 0x59, 0xbe,
+	0xf6, 0x3e, 0x02, 0xfa, 0x63, 0xee, 0x48, 0x19, 0x5b, 0x53, 0xd5, 0x9b, 0x6d, 0xee, 0x53, 0x3f,
+	0x24, 0xa7, 0x12, 0x76, 0x0c, 0x0b, 0xe1, 0x48, 0x9e, 0x2a, 0x15, 0x2e, 0x40, 0xce, 0xb3, 0xcf,
+	0x89, 0x4c, 0x84, 0xbc, 0x21, 0x0d, 0xf6, 0xc3, 0x7c, 0x2a, 0x83, 0x8d, 0x40, 0x18, 0xdb, 0x92,
+	0xd3, 0xda, 0x4b, 0x57, 0x53, 0x1e, 0xe0, 0x78, 0x03, 0xef, 0xc2, 0xad, 0x68, 0x9a, 0x98, 0xca,
+	0xe4, 0xf7, 0x7c, 0x03, 0x27, 0x65, 0x92, 0xa9, 0xe4, 0xfe, 0x24, 0x48, 0x06, 0x4a, 0x42, 0x99,
+	0x4a, 0xa4, 0x0e, 0xcd, 0xa4, 0xfc, 0xf2, 0x75, 0xec, 0x57, 0x3f, 0xdd, 0x4c, 0x25, 0xcc, 0x0d,
+	0x84, 0x4d, 0xbf, 0xfc, 0x41, 0x8e, 0xc8, 0x4e, 0xcc, 0x11, 0x22, 0x48, 0x82, 0x2c, 0xf6, 0x0d,
+	0x6c, 0x3a, 0xa1, 0x23, 0x48, 0xa0, 0xd3, 0xea, 0xa0, 0x35, 0xc4, 0xd7, 0xc1, 0x1a, 0x72, 0x63,
+	0xab, 0x69, 0x77, 0xaa, 0xc5, 0xf8, 0x34, 0xc8, 0x9d, 0xb1, 0xcc, 0x3c, 0x95, 0xe0, 0xcf, 0x60,
+	0x29, 0x3d, 0x29, 0x4f, 0x23, 0xf9, 0x45, 0x0b, 0x4a, 0xfe, 0xa1, 0x54, 0xf9, 0x69, 0x45, 0x19,
+	0x0a, 0xbb, 0x7b, 0x07, 0xfb, 0x6b, 0xeb, 0x6d, 0xfe, 0xdb, 0x8a, 0xf5, 0x3d, 0x5d, 0x3f, 0xdc,
+	0xef, 0xd4, 0x33, 0xab, 0xff, 0x9b, 0x85, 0xcc, 0xf6, 0x7b, 0xf4, 0xfb, 0x90, 0xe3, 0x0f, 0x8d,
+	0x13, 0x5e, 0x97, 0x9b, 0x93, 0xde, 0x52, 0xf1, 0xdd, 0x9f, 0xff, 0xfb, 0x7f, 0xfd, 0x32, 0x73,
+	0x13, 0xd7, 0x5b, 0xe3, 0xef, 0x1d, 0x13, 0xcf, 0x68, 0x9d, 0x8f, 0x5b, 0xac, 0x3e, 0xbc, 0xd6,
+	0x5e, 0xa0, 0x43, 0xc8, 0xee, 0x8f, 0x3c, 0x94, 0xfa, 0xf2, 0xdc, 0x4c, 0x7f, 0x62, 0xc5, 0x77,
+	0x98, 0xe0, 0x79, 0x5c, 0x53, 0x04, 0x0f, 0x47, 0x1e, 0x15, 0x3b, 0x82, 0xb2, 0xfa, 0x48, 0x7a,
+	0xe5, 0x93, 0x74, 0xf3, 0xea, 0x07, 0x58, 0xfc, 0x90, 0xa9, 0xbb, 0x8b, 0x6f, 0x29, 0xea, 0xf8,
+	0x53, 0xae, 0x3a, 0x9b, 0xce, 0x85, 0x85, 0x52, 0x1f, 0xad, 0x9b, 0xe9, 0xef, 0xb2, 0x89, 0xb3,
+	0xf1, 0x2e, 0x2c, 0x2a, 0xd6, 0x12, 0xcf, 0xb2, 0x5d, 0x0f, 0x3d, 0x48, 0x78, 0x96, 0x53, 0x1f,
+	0xa0, 0x9a, 0x4b, 0xe9, 0x0c, 0x42, 0xd1, 0x12, 0x53, 0xd4, 0xc4, 0x37, 0x15, 0x45, 0x5d, 0x9f,
+	0xed, 0xb5, 0xf6, 0x62, 0xf5, 0x14, 0x72, 0x0c, 0x65, 0x46, 0x7f, 0x20, 0x3f, 0x9a, 0x09, 0xd0,
+	0x79, 0xca, 0xe2, 0x87, 0xf0, 0x69, 0xdc, 0x60, 0xca, 0x10, 0xae, 0x4a, 0x65, 0x0c, 0x67, 0x7e,
+	0xad, 0xbd, 0x58, 0xd6, 0xbe, 0xa3, 0xad, 0xfe, 0xcf, 0x2c, 0xe4, 0x18, 0xe4, 0x84, 0x6c, 0x80,
+	0x00, 0x91, 0x8d, 0xce, 0x32, 0x86, 0xf1, 0x46, 0x67, 0x19, 0x07, 0x73, 0xf1, 0x22, 0x53, 0xdc,
+	0xc0, 0xf3, 0x52, 0x31, 0x43, 0xb3, 0x5a, 0x0c, 0xa0, 0xa3, 0x3e, 0x1d, 0x0b, 0xd0, 0x8d, 0x87,
+	0x19, 0x4a, 0x12, 0x18, 0x42, 0x66, 0xa3, 0x3b, 0x24, 0x01, 0x95, 0xc5, 0x98, 0xe9, 0xbc, 0x87,
+	0x6f, 0x2b, 0x9e, 0xe5, 0x6a, 0x1d, 0xc6, 0x48, 0xf5, 0xfe, 0x99, 0x06, 0xb5, 0x30, 0xb6, 0x8a,
+	0x1e, 0x25, 0x48, 0x8e, 0x42, 0xb4, 0xcd, 0xc7, 0x93, 0x99, 0xd2, 0x2c, 0xe0, 0xea, 0xcf, 0x09,
+	0x19, 0x1a, 0x94, 0x51, 0x38, 0x1e, 0xfd, 0x85, 0x06, 0x73, 0x11, 0xc0, 0x14, 0x25, 0x69, 0x88,
+	0xc1, 0xb1, 0xcd, 0x27, 0x57, 0x70, 0x09, 0x43, 0x9e, 0x32, 0x43, 0x96, 0xf0, 0xdd, 0x98, 0x2b,
+	0x3c, 0x73, 0x40, 0x3c, 0x5b, 0x18, 0xe3, 0x2f, 0x03, 0x07, 0x37, 0x13, 0x97, 0x21, 0x04, 0x96,
+	0x26, 0x2e, 0x43, 0x18, 0x19, 0x9d, 0xb0, 0x0c, 0x1c, 0xd1, 0xa4, 0x5b, 0xfc, 0xff, 0xb2, 0x50,
+	0x58, 0xe7, 0x3f, 0x70, 0x44, 0x2e, 0x94, 0x7c, 0x14, 0x11, 0x2d, 0x26, 0x21, 0x3a, 0xc1, 0x6d,
+	0xa1, 0xf9, 0x20, 0xb5, 0x5f, 0x68, 0x7f, 0xc2, 0xb4, 0x3f, 0xc0, 0x4d, 0xa9, 0x5d, 0xfc, 0x8e,
+	0xb2, 0xc5, 0xa1, 0x83, 0x96, 0xd1, 0xeb, 0xd1, 0x89, 0xff, 0x29, 0x54, 0x54, 0xa8, 0x0f, 0x3d,
+	0x4c, 0x44, 0x92, 0x54, 0xb4, 0xb0, 0x89, 0x27, 0xb1, 0x08, 0xed, 0xcb, 0x4c, 0x3b, 0xc6, 0xf7,
+	0x53, 0xb4, 0x3b, 0x8c, 0x3d, 0x64, 0x00, 0x87, 0xea, 0x92, 0x0d, 0x08, 0x21, 0x81, 0xc9, 0x06,
+	0x84, 0x91, 0xbe, 0x2b, 0x0d, 0x18, 0x31, 0x76, 0x6a, 0xc0, 0x07, 0x80, 0x00, 0x98, 0x43, 0x89,
+	0x7e, 0x55, 0xae, 0x4e, 0xd1, 0x90, 0x8f, 0x63, 0x7a, 0xf1, 0x3d, 0x17, 0x51, 0xdd, 0x37, 0x5d,
+	0x1a, 0xfa, 0xab, 0xbf, 0xca, 0x43, 0xf9, 0x9d, 0x61, 0x5a, 0x1e, 0xb1, 0x0c, 0xab, 0x4b, 0xd0,
+	0x09, 0xe4, 0x58, 0x69, 0x8c, 0x66, 0x39, 0x15, 0xaf, 0x8a, 0x66, 0xb9, 0x10, 0x98, 0x83, 0x1f,
+	0x33, 0xcd, 0x8b, 0xf8, 0x8e, 0xd4, 0x3c, 0x08, 0xc4, 0xb7, 0x18, 0x0e, 0x43, 0x27, 0xfc, 0x87,
+	0x90, 0x17, 0x10, 0x7f, 0x44, 0x58, 0x08, 0x9f, 0x69, 0xde, 0x4b, 0xee, 0x4c, 0xdb, 0x5e, 0xaa,
+	0x2a, 0x97, 0xf1, 0x52, 0x5d, 0x1f, 0x01, 0x02, 0x90, 0x31, 0xea, 0xdc, 0x18, 0x26, 0xd9, 0x5c,
+	0x4a, 0x67, 0x10, 0x7a, 0x9f, 0x33, 0xbd, 0x8f, 0xf0, 0x62, 0x92, 0xde, 0x9e, 0xcf, 0x4f, 0x75,
+	0x1f, 0xc3, 0xec, 0xa6, 0xe1, 0x9e, 0xa1, 0x48, 0xb1, 0x53, 0x7e, 0x93, 0xd0, 0x6c, 0x26, 0x75,
+	0x09, 0x4d, 0x8f, 0x98, 0xa6, 0xfb, 0xb8, 0x91, 0xa4, 0xe9, 0xcc, 0x70, 0x69, 0xf5, 0x40, 0x67,
+	0x90, 0xe7, 0x3f, 0x53, 0x88, 0xfa, 0x32, 0xf4, 0x53, 0x87, 0xa8, 0x2f, 0xc3, 0xbf, 0x6c, 0xb8,
+	0x9e, 0x26, 0x0f, 0x8a, 0xf2, 0xb7, 0x01, 0xe8, 0x7e, 0x64, 0x69, 0xc2, 0xbf, 0x23, 0x68, 0x2e,
+	0xa6, 0x75, 0x0b, 0x7d, 0xcf, 0x98, 0xbe, 0x87, 0xf8, 0x5e, 0xe2, 0xda, 0x09, 0xee, 0xd7, 0xda,
+	0x8b, 0xef, 0x68, 0xb4, 0x4c, 0x40, 0x00, 0xd4, 0xc6, 0xa2, 0x23, 0x8a, 0xf9, 0xc6, 0xa2, 0x23,
+	0x86, 0xf1, 0xe2, 0x55, 0xa6, 0xfc, 0x15, 0x7e, 0x96, 0xa4, 0xdc, 0x73, 0x0c, 0xcb, 0x3d, 0x21,
+	0xce, 0x27, 0x1c, 0x90, 0x73, 0xcf, 0xcc, 0x21, 0x8d, 0x94, 0xff, 0x9f, 0x83, 0x59, 0x7a, 0x1e,
+	0xa5, 0xe5, 0x39, 0xb8, 0xc6, 0x47, 0xad, 0x89, 0x81, 0x67, 0x51, 0x6b, 0xe2, 0x08, 0x40, 0xbc,
+	0x3c, 0xb3, 0x9f, 0xb2, 0x13, 0xc6, 0x44, 0xbd, 0xee, 0x42, 0x59, 0xb9, 0xeb, 0xa3, 0x04, 0x81,
+	0x61, 0x64, 0x2e, 0x5a, 0x17, 0x12, 0x80, 0x02, 0xfc, 0x80, 0xe9, 0xbc, 0x83, 0x17, 0x42, 0x3a,
+	0x7b, 0x9c, 0x8b, 0x2a, 0xfd, 0x63, 0xa8, 0xa8, 0x98, 0x00, 0x4a, 0x90, 0x19, 0x41, 0xfe, 0xa2,
+	0x29, 0x31, 0x09, 0x52, 0x88, 0x67, 0x07, 0xff, 0x67, 0xfb, 0x92, 0x95, 0x2a, 0x1f, 0x42, 0x41,
+	0x00, 0x05, 0x49, 0xb3, 0x0d, 0x43, 0x85, 0x49, 0xb3, 0x8d, 0xa0, 0x0c, 0xf1, 0x63, 0x1e, 0xd3,
+	0x4a, 0xef, 0x43, 0xb2, 0x04, 0x09, 0x8d, 0x6f, 0x89, 0x97, 0xa6, 0x31, 0xc0, 0xbe, 0xd2, 0x34,
+	0x2a, 0x77, 0xd1, 0x49, 0x1a, 0x4f, 0x89, 0x27, 0x62, 0x49, 0xde, 0xf3, 0x50, 0x8a, 0x40, 0x35,
+	0xe5, 0xe3, 0x49, 0x2c, 0x69, 0xa7, 0xf2, 0x40, 0xa9, 0xc8, 0xf7, 0xe8, 0x67, 0x00, 0x01, 0xa4,
+	0x11, 0x3d, 0x6d, 0x25, 0xe2, 0xa2, 0xd1, 0xd3, 0x56, 0x32, 0x2a, 0x12, 0xcf, 0x1f, 0x81, 0x6e,
+	0x7e, 0x31, 0xa0, 0xda, 0xff, 0x56, 0x03, 0x14, 0x47, 0x40, 0xd0, 0xcb, 0x64, 0x0d, 0x89, 0x88,
+	0x6b, 0xf3, 0xd5, 0xf5, 0x98, 0xd3, 0x4a, 0x44, 0x60, 0x56, 0x97, 0x8d, 0x18, 0x7e, 0xa0, 0x86,
+	0xfd, 0x42, 0x83, 0x6a, 0x08, 0x42, 0x41, 0x4f, 0x53, 0xd6, 0x38, 0x02, 0xda, 0x36, 0x9f, 0x5d,
+	0xc9, 0x97, 0x76, 0x12, 0x53, 0x76, 0x84, 0x3c, 0x88, 0xff, 0xa5, 0x06, 0xb5, 0x30, 0xec, 0x82,
+	0x52, 0xe4, 0xc7, 0x80, 0xdf, 0xe6, 0xf2, 0xd5, 0x8c, 0x57, 0x2f, 0x55, 0x70, 0x36, 0x1f, 0x42,
+	0x41, 0x80, 0x35, 0x49, 0x01, 0x11, 0x86, 0x8d, 0x93, 0x02, 0x22, 0x82, 0xf4, 0xa4, 0x04, 0x84,
+	0x63, 0xf7, 0x89, 0x12, 0x82, 0x02, 0xd1, 0x49, 0xd3, 0x38, 0x39, 0x04, 0x23, 0x70, 0xd0, 0x24,
+	0x8d, 0x41, 0x08, 0x4a, 0x38, 0x07, 0xa5, 0x08, 0xbc, 0x22, 0x04, 0xa3, 0x68, 0x50, 0x4a, 0x08,
+	0x32, 0xa5, 0x4a, 0x08, 0x06, 0xe0, 0x4b, 0x52, 0x08, 0xc6, 0x10, 0xf1, 0xa4, 0x10, 0x8c, 0xe3,
+	0x37, 0x29, 0xeb, 0xca, 0x74, 0x87, 0x42, 0x70, 0x3e, 0x01, 0xab, 0x41, 0xaf, 0x52, 0x1c, 0x9a,
+	0x08, 0xb6, 0x37, 0x3f, 0xb9, 0x26, 0xf7, 0xc4, 0xbd, 0xcf, 0x97, 0x42, 0xee, 0xfd, 0x7f, 0xd0,
+	0x60, 0x21, 0x09, 0xeb, 0x41, 0x29, 0xba, 0x52, 0x80, 0xfa, 0xe6, 0xca, 0x75, 0xd9, 0xaf, 0xf6,
+	0x9a, 0x1f, 0x0d, 0x6f, 0xea, 0xff, 0xf2, 0xc5, 0xa2, 0xf6, 0x6f, 0x5f, 0x2c, 0x6a, 0xff, 0xf1,
+	0xc5, 0xa2, 0xf6, 0x77, 0xff, 0xb9, 0x38, 0x73, 0x9c, 0x67, 0xff, 0x81, 0xec, 0x7b, 0xbf, 0x09,
+	0x00, 0x00, 0xff, 0xff, 0x62, 0x18, 0xc8, 0xf6, 0xd0, 0x36, 0x00, 0x00,
 }

etcdserver/etcdserverpb/rpc.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 package etcdserverpb;
 
 import "gogoproto/gogo.proto";
-import "etcd/mvcc/mvccpb/kv.proto";
+import "etcd/internal/mvcc/mvccpb/kv.proto";
 import "etcd/auth/authpb/auth.proto";
 
 // for grpc-gateway

etcdserver/membership/cluster.go

@@ -27,12 +27,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc/backend"
+	"github.com/coreos/etcd/internal/store"
 	"github.com/coreos/etcd/pkg/netutil"
 	"github.com/coreos/etcd/pkg/types"
 	"github.com/coreos/etcd/raft"
 	"github.com/coreos/etcd/raft/raftpb"
-	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/version"
 
 	"github.com/coreos/go-semver/semver"

etcdserver/membership/cluster_test.go

@@ -21,11 +21,11 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/coreos/etcd/internal/store"
 	"github.com/coreos/etcd/pkg/mock/mockstore"
 	"github.com/coreos/etcd/pkg/testutil"
 	"github.com/coreos/etcd/pkg/types"
 	"github.com/coreos/etcd/raft/raftpb"
-	"github.com/coreos/etcd/store"
 )
 
 func TestClusterMember(t *testing.T) {

etcdserver/membership/store.go

@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc/backend"
+	"github.com/coreos/etcd/internal/store"
 	"github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/etcd/store"
 
 	"github.com/coreos/go-semver/semver"
 )

etcdserver/server.go

@@ -38,11 +38,12 @@ import (
 	"github.com/coreos/etcd/internal/alarm"
 	"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"
+	"github.com/coreos/etcd/internal/mvcc"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/coreos/etcd/internal/raftsnap"
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/lease/leasehttp"
-	"github.com/coreos/etcd/mvcc"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/store"
 	"github.com/coreos/etcd/pkg/fileutil"
 	"github.com/coreos/etcd/pkg/idutil"
 	"github.com/coreos/etcd/pkg/pbutil"
@@ -53,7 +54,6 @@ import (
 	"github.com/coreos/etcd/raft"
 	"github.com/coreos/etcd/raft/raftpb"
 	"github.com/coreos/etcd/rafthttp"
-	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/version"
 	"github.com/coreos/etcd/wal"
 

etcdserver/server_test.go

@@ -28,10 +28,11 @@ import (
 
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/etcdserver/membership"
+	"github.com/coreos/etcd/internal/lease"
+	"github.com/coreos/etcd/internal/mvcc"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/coreos/etcd/internal/raftsnap"
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/store"
 	"github.com/coreos/etcd/pkg/fileutil"
 	"github.com/coreos/etcd/pkg/idutil"
 	"github.com/coreos/etcd/pkg/mock/mockstorage"
@@ -44,7 +45,6 @@ import (
 	"github.com/coreos/etcd/raft"
 	"github.com/coreos/etcd/raft/raftpb"
 	"github.com/coreos/etcd/rafthttp"
-	"github.com/coreos/etcd/store"
 )
 
 // TestDoLocalAction tests requests which do not need to go through raft to be applied,

etcdserver/snapshot_merge.go

@@ -17,8 +17,8 @@ package etcdserver
 import (
 	"io"
 
+	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/coreos/etcd/internal/raftsnap"
-	"github.com/coreos/etcd/mvcc/backend"
 	"github.com/coreos/etcd/raft/raftpb"
 )
 

etcdserver/v2_server.go

@@ -19,7 +19,7 @@ import (
 	"time"
 
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/store"
+	"github.com/coreos/etcd/internal/store"
 )
 
 type RequestV2 pb.Request

etcdserver/v3_server.go

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

integration/v3_alarm_test.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/coreos/etcd/pkg/testutil"
 )
 

integration/v3_lease_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 	"github.com/coreos/etcd/pkg/testutil"
 
 	"google.golang.org/grpc/metadata"

integration/v3_lock_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
 	"github.com/coreos/etcd/contrib/recipes"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 	"github.com/coreos/etcd/pkg/testutil"
 )
 

integration/v3_watch_test.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/coreos/etcd/etcdserver/api/v3rpc"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 	"github.com/coreos/etcd/pkg/testutil"
 )
 

internal/alarm/alarms.go

@@ -19,7 +19,7 @@ import (
 	"sync"
 
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/coreos/etcd/pkg/types"
 	"github.com/coreos/pkg/capnslog"
 )

internal/compactor/periodic.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/etcd/mvcc"
+	"github.com/coreos/etcd/internal/mvcc"
 
 	"github.com/jonboulle/clockwork"
 )

internal/compactor/revision.go

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

lease/leasehttp/http.go → internal/lease/leasehttp/http.go

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

lease/leasehttp/http_test.go → internal/lease/leasehttp/http_test.go

@@ -23,8 +23,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/lease"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 )
 
 func TestRenewHTTP(t *testing.T) {

lease/lessor.go → internal/lease/lessor.go

@@ -22,8 +22,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/etcd/lease/leasepb"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/lease/leasepb"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 )
 
 // NoLease is a special LeaseID representing the absence of a lease.

lease/lessor_test.go → internal/lease/lessor_test.go

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

mvcc/kv.go → internal/mvcc/kv.go

@@ -15,9 +15,9 @@
 package mvcc
 
 import (
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/coreos/etcd/internal/lease"
+	"github.com/coreos/etcd/internal/mvcc/backend"
+	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )
 
 type RangeOptions struct {

mvcc/kv_test.go → internal/mvcc/kv_test.go

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

mvcc/kv_view.go → internal/mvcc/kv_view.go

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

mvcc/kvstore.go → internal/mvcc/kvstore.go

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

mvcc/kvstore_bench_test.go → internal/mvcc/kvstore_bench_test.go

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

mvcc/kvstore_compaction_test.go → internal/mvcc/kvstore_compaction_test.go

@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/lease"
-	"github.com/coreos/etcd/mvcc/backend"
+	"github.com/coreos/etcd/internal/lease"
+	"github.com/coreos/etcd/internal/mvcc/backend"
 )
 
 func TestScheduleCompaction(t *testing.T) {

mvcc/kvstore_test.go → internal/mvcc/kvstore_test.go

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