Merge 95d3daf into 2340c80

fog · Jul 19, 2013 · 3f7c316 · 3f7c316
2 parents 2340c80 + 95d3daf
commit 3f7c316
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/fog/aws/parsers/storage/complete_multipart_upload.rb b/lib/fog/aws/parsers/storage/complete_multipart_upload.rb
@@ -11,7 +11,7 @@ def reset
 
           def end_element(name)
             case name
-            when 'Bucket', 'ETag', 'Key', 'Location'
+            when 'Bucket', 'ETag', 'Key', 'Location', 'Code', 'Message'
               @response[name] = value
             end
           end

diff --git a/lib/fog/aws/requests/storage/complete_multipart_upload.rb b/lib/fog/aws/requests/storage/complete_multipart_upload.rb
@@ -13,12 +13,16 @@ class Real
         # @param [Array<String>] parts Array of etags as Strings for parts
         #
         # @return [Excon::Response]
-        #   * headers [Hash]:
+        #   * body [Hash]: (success)
         #     * Bucket [String] - bucket of new object
-        #     * ETag [String] - etag of new object (will be needed to complete upload)
+        #     * ETag [String] - etag of new object
         #     * Key [String] - key of new object
         #     * Location [String] - location of new object
+        #   * body [Hash]: (failure)
+        #     * Code [String] - Error status code
+        #     * Message [String] - Error description
         #
+        # @note This request could fail and still return +200 OK+, so it's important that you check the response.
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadComplete.html
         #
         def complete_multipart_upload(bucket_name, object_name, upload_id, parts)