lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-21 09:17:23 +08:00
Code Issues Actions 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
2021-03-16 15:29:49 +05:00
parent 06da02739d 9672f9e1b2
commit eb54993a4e
20 changed files with 109 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
weed/s3api/s3api_objects_list_handlers.go
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
}