diff options
| author | George Goldberg <george@gberg.me> | 2018-02-19 11:19:39 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-19 11:19:39 +0000 |
| commit | f8289eb286d00c29859a8df495b957c7b46cb249 (patch) | |
| tree | 1bc18d6a3a795482c7229786f7ab427fabbcd007 /vendor/github.com/minio/minio-go/api-compose-object.go | |
| parent | 8891fa2a5e9e08eb9fa99ec163c47a6e9761a816 (diff) | |
| parent | 30197584d5a215a3b25bffa79a034ed9e360cf52 (diff) | |
| download | chat-f8289eb286d00c29859a8df495b957c7b46cb249.tar.gz chat-f8289eb286d00c29859a8df495b957c7b46cb249.tar.bz2 chat-f8289eb286d00c29859a8df495b957c7b46cb249.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'vendor/github.com/minio/minio-go/api-compose-object.go')
| -rw-r--r-- | vendor/github.com/minio/minio-go/api-compose-object.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/github.com/minio/minio-go/api-compose-object.go b/vendor/github.com/minio/minio-go/api-compose-object.go index 81314e3b4..88b60d604 100644 --- a/vendor/github.com/minio/minio-go/api-compose-object.go +++ b/vendor/github.com/minio/minio-go/api-compose-object.go @@ -476,8 +476,8 @@ func (c Client) ComposeObject(dst DestinationInfo, srcs []SourceInfo) error { // Single source object case (i.e. when only one source is // involved, it is being copied wholly and at most 5GiB in - // size). - if totalParts == 1 && srcs[0].start == -1 && totalSize <= maxPartSize { + // size, emptyfiles are also supported). + if (totalParts == 1 && srcs[0].start == -1 && totalSize <= maxPartSize) || (totalSize == 0) { h := srcs[0].Headers // Add destination encryption headers for k, v := range dst.encryption.getSSEHeaders(false) { |