diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-08-01 14:45:22 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-08-01 14:45:22 +0500 |
| commit | 3c75479e2b0554778f70e417130236dbf2eac031 (patch) | |
| tree | fe62db8d4facbd3638640889ec1fc43bff600017 /weed/shell/commands.go | |
| parent | c0d92f61a1b22980f755c55b73ab0ea5cf4e2eaf (diff) | |
| parent | 036566629ac327deaa66a296387901b56b6fb325 (diff) | |
| download | seaweedfs-3c75479e2b0554778f70e417130236dbf2eac031.tar.xz seaweedfs-3c75479e2b0554778f70e417130236dbf2eac031.zip | |
Merge branch 'master' into gentle_vacuum
# Conflicts:
# weed/pb/messaging_pb/messaging.pb.go
# weed/pb/messaging_pb/messaging_grpc.pb.go
# weed/pb/s3_pb/s3.pb.go
# weed/pb/volume_server_pb/volume_server.pb.go
# weed/server/volume_grpc_vacuum.go
Diffstat (limited to 'weed/shell/commands.go')
| -rw-r--r-- | weed/shell/commands.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/weed/shell/commands.go b/weed/shell/commands.go index 08f639d34..378c89b25 100644 --- a/weed/shell/commands.go +++ b/weed/shell/commands.go @@ -9,11 +9,11 @@ import ( "google.golang.org/grpc" - "github.com/chrislusf/seaweedfs/weed/pb" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "github.com/chrislusf/seaweedfs/weed/util" - "github.com/chrislusf/seaweedfs/weed/wdclient" - "github.com/chrislusf/seaweedfs/weed/wdclient/exclusive_locks" + "github.com/seaweedfs/seaweedfs/weed/pb" + "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" + "github.com/seaweedfs/seaweedfs/weed/util" + "github.com/seaweedfs/seaweedfs/weed/wdclient" + "github.com/seaweedfs/seaweedfs/weed/wdclient/exclusive_locks" ) type ShellOptions struct { @@ -47,7 +47,7 @@ var ( func NewCommandEnv(options *ShellOptions) *CommandEnv { ce := &CommandEnv{ env: make(map[string]string), - MasterClient: wdclient.NewMasterClient(options.GrpcDialOption, *options.FilerGroup, pb.AdminShellClient, "", "", pb.ServerAddresses(*options.Masters).ToAddressMap()), + MasterClient: wdclient.NewMasterClient(options.GrpcDialOption, *options.FilerGroup, pb.AdminShellClient, "", "", "", pb.ServerAddresses(*options.Masters).ToAddressMap()), option: options, } ce.locker = exclusive_locks.NewExclusiveLocker(ce.MasterClient, "admin") |