diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-02 07:45:20 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-02 07:45:20 -0400 |
| commit | 7d5e85e4136b0e2e6cf902c48b186d99f0698d13 (patch) | |
| tree | 84f7256de28eed0fd932f43532c218b385e09642 /vendor/github.com/minio/minio-go/api-put-object-streaming.go | |
| parent | f4dcb4edf2aafca85c9af631131a77888da24bc7 (diff) | |
| parent | 529807c1ba0c6b5e697d95d35b46865e22b0e62a (diff) | |
| download | chat-7d5e85e4136b0e2e6cf902c48b186d99f0698d13.tar.gz chat-7d5e85e4136b0e2e6cf902c48b186d99f0698d13.tar.bz2 chat-7d5e85e4136b0e2e6cf902c48b186d99f0698d13.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'vendor/github.com/minio/minio-go/api-put-object-streaming.go')
| -rw-r--r-- | vendor/github.com/minio/minio-go/api-put-object-streaming.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/github.com/minio/minio-go/api-put-object-streaming.go b/vendor/github.com/minio/minio-go/api-put-object-streaming.go index be1dc57ef..211d1c23c 100644 --- a/vendor/github.com/minio/minio-go/api-put-object-streaming.go +++ b/vendor/github.com/minio/minio-go/api-put-object-streaming.go @@ -167,7 +167,7 @@ func (c Client) putObjectMultipartStreamFromReadAt(ctx context.Context, bucketNa var objPart ObjectPart objPart, err = c.uploadPart(ctx, bucketName, objectName, uploadID, sectionReader, uploadReq.PartNum, - "", "", partSize, opts.UserMetadata) + "", "", partSize, opts.ServerSideEncryption) if err != nil { uploadedPartsCh <- uploadedPartRes{ Size: 0, @@ -280,7 +280,7 @@ func (c Client) putObjectMultipartStreamNoChecksum(ctx context.Context, bucketNa var objPart ObjectPart objPart, err = c.uploadPart(ctx, bucketName, objectName, uploadID, io.LimitReader(hookReader, partSize), - partNumber, "", "", partSize, opts.UserMetadata) + partNumber, "", "", partSize, opts.ServerSideEncryption) if err != nil { return totalUploadedSize, err } |