Merge branch 'upstreamMaster' into check_chunkviews_mr

# Conflicts:
#	weed/filer/filechunk_manifest.go
#	weed/filer/stream.go
#	weed/replication/repl_util/replication_util.go
#	weed/util/fasthttp_util.go
This commit is contained in:
Konstantin Lebedev committed 2021-03-16 15:29:49 +05:00
commit eb54993a4e
20 files changed
+109 -208

No files matched your search

+1 -1
View File
@@ -35,7 +35,7 @@ func ReadContent(filerAddress string, dir, name string) ([]byte, error) {
target := fmt.Sprintf("http://%s%s/%s", filerAddress, dir, name)
data, _, err := util.FastGet(target)
data, _, err := util.Get(target)
return data, err
}