aboutsummaryrefslogtreecommitdiff
path: root/weed/command/s3.go
diff options
context:
space:
mode:
authorJonathan Amsterdam <jba@google.com>2019-03-20 16:02:38 -0400
committerJonathan Amsterdam <jba@google.com>2019-03-20 16:02:38 -0400
commite966033098ce13fdda97dd96b309357bd410d8d6 (patch)
treedd401620f393d366e6c6ab80c15589eadfa2aea2 /weed/command/s3.go
parent8db82e2b75eb67bc58a4869cc70fb8c5b2c0b97c (diff)
parent977b30e992108e480c883cdd461bf0c8f6598f25 (diff)
downloadseaweedfs-e966033098ce13fdda97dd96b309357bd410d8d6.tar.xz
seaweedfs-e966033098ce13fdda97dd96b309357bd410d8d6.zip
Merge branch 'master' of https://github.com/chrislusf/seaweedfs into gocdk
Diffstat (limited to 'weed/command/s3.go')
-rw-r--r--weed/command/s3.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/command/s3.go b/weed/command/s3.go
index a54ddd2f7..9aa9f8e2f 100644
--- a/weed/command/s3.go
+++ b/weed/command/s3.go
@@ -51,7 +51,7 @@ func runS3(cmd *Command, args []string) bool {
weed_server.LoadConfiguration("security", false)
- filerGrpcAddress, err := parseFilerGrpcAddress(*s3options.filer, *s3options.filerGrpcPort)
+ filerGrpcAddress, err := parseFilerGrpcAddress(*s3options.filer)
if err != nil {
glog.Fatal(err)
return false