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-context.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-context.go')
| -rw-r--r-- | vendor/github.com/minio/minio-go/api-put-object-context.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vendor/github.com/minio/minio-go/api-put-object-context.go b/vendor/github.com/minio/minio-go/api-put-object-context.go index a6f23dcaa..ff4663e2f 100644 --- a/vendor/github.com/minio/minio-go/api-put-object-context.go +++ b/vendor/github.com/minio/minio-go/api-put-object-context.go @@ -29,11 +29,5 @@ func (c Client) PutObjectWithContext(ctx context.Context, bucketName, objectName if err != nil { return 0, err } - if opts.EncryptMaterials != nil { - if err = opts.EncryptMaterials.SetupEncryptMode(reader); err != nil { - return 0, err - } - return c.putObjectMultipartStreamNoLength(ctx, bucketName, objectName, opts.EncryptMaterials, opts) - } return c.putObjectCommon(ctx, bucketName, objectName, reader, objectSize, opts) } |