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/util/config.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/util/config.go')
| -rw-r--r-- | weed/util/config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/util/config.go b/weed/util/config.go index f09ac7e5e..a242742fc 100644 --- a/weed/util/config.go +++ b/weed/util/config.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/viper" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/glog" ) var ( |