Github-Mirror/seaweedfs
1
0 Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-11-11 06:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstreamMaster' into check_chunkviews_mr

Browse Source 
# 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
2 parents 06da02739d 9672f9e1b2
commit eb54993a4e
20 files changed
+109 -208
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

weed/s3api/s3api_objects_list_handlers.go
-1
View File
@@ -206,7 +206,6 @@ func (s3a *S3ApiServer) doListFilerEntries(client filer_pb.SeaweedFilerClient, d
isTruncated = isTruncated || subIsTruncated
maxKeys -= subCounter
nextMarker = subDir + "/" + subNextMarker
counter += subCounter
// finished processing this sub directory
marker = subDir
}