kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

how do I updates my clone with updates from source?

Browse source
This commit is contained in:
Danny Garcia 2013-01-06 21:37:37 -05:00
parent bad71d1805
commit 59799e499b
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/fog/aws/requests/storage/copy_object.rb
View file

@ -8,7 +8,6 @@ module Fog
#
# Copy an object from one S3 bucket to another
#
<<<<<<< HEAD
# @param source_bucket_name [String] Name of source bucket
# @param source_object_name [String] Name of source object
# @param target_bucket_name [String] Name of bucket to create copy in
@ -30,8 +29,6 @@ module Fog
#
# @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectCOPY.html
#
=======
>>>>>>> change copy_object docs to YARD
def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
headers = { 'x-amz-copy-source' => "/#{source_bucket_name}/#{CGI.escape(source_object_name)}" }.merge!(options)
request({