diff options
| author | Konstantin Lebedev <lebedev_k@tochka.com> | 2021-03-16 15:29:49 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <lebedev_k@tochka.com> | 2021-03-16 15:29:49 +0500 |
| commit | eb54993a4eacffde48007bb3bcc46b664d38c403 (patch) | |
| tree | 1ef3f4cd86f9772631496a193bdeb62e25e780de /weed/s3api | |
| parent | 06da02739d4a97dd8288f7fa05de7cd369e97d78 (diff) | |
| parent | 9672f9e1b2ed399470e6ec877a667417c8b26870 (diff) | |
| download | seaweedfs-eb54993a4eacffde48007bb3bcc46b664d38c403.tar.xz seaweedfs-eb54993a4eacffde48007bb3bcc46b664d38c403.zip | |
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
Diffstat (limited to 'weed/s3api')
| -rw-r--r-- | weed/s3api/s3api_objects_list_handlers.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/weed/s3api/s3api_objects_list_handlers.go b/weed/s3api/s3api_objects_list_handlers.go index 2d36c6ec9..739cdd8f9 100644 --- a/weed/s3api/s3api_objects_list_handlers.go +++ b/weed/s3api/s3api_objects_list_handlers.go @@ -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 } |