aboutsummaryrefslogtreecommitdiff
path: root/weed/command/upload.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2021-08-03 21:20:05 -0700
committerChris Lu <chris.lu@gmail.com>2021-08-03 21:20:05 -0700
commit42969c9c6247117f99ece43194912cd098acceb0 (patch)
tree804a7b7a666b2714082acdae396d04e0707f70c7 /weed/command/upload.go
parent81b255df8b7352e7a420e7dc4a56cf58bcb9075f (diff)
parent8cf0c515bfb45c5d8e6c71f96c43f91cae30ea9d (diff)
downloadseaweedfs-42969c9c6247117f99ece43194912cd098acceb0.tar.xz
seaweedfs-42969c9c6247117f99ece43194912cd098acceb0.zip
Merge branch 'master' into add_remote_storage
Diffstat (limited to 'weed/command/upload.go')
-rw-r--r--weed/command/upload.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/command/upload.go b/weed/command/upload.go
index ccdec561f..9ae1befab 100644
--- a/weed/command/upload.go
+++ b/weed/command/upload.go
@@ -71,13 +71,13 @@ func runUpload(cmd *Command, args []string) bool {
util.LoadConfiguration("security", false)
grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")
- defaultCollection, err := readMasterConfiguration(grpcDialOption, *upload.master)
+ defaultReplication, err := readMasterConfiguration(grpcDialOption, *upload.master)
if err != nil {
fmt.Printf("upload: %v", err)
return false
}
if *upload.replication == "" {
- *upload.replication = defaultCollection
+ *upload.replication = defaultReplication
}
if len(args) == 0 {