mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
[google] Instances are created without description, and disk size is ignored
Handle hash merge! properly
This commit is contained in:
parent
1251e89e61
commit
9c15240edd
6 changed files with 6 additions and 6 deletions
|
@ -121,7 +121,7 @@ module Fog
|
|||
options['Content-MD5'] = content_md5 if content_md5
|
||||
options['Content-Type'] = content_type if content_type
|
||||
options['Expires'] = expires if expires
|
||||
options.merge(metadata)
|
||||
options.merge!(metadata)
|
||||
|
||||
data = service.put_object(directory.key, key, body, options)
|
||||
merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
|
||||
|
|
|
@ -93,7 +93,7 @@ module Fog
|
|||
|
||||
def new(attributes = {})
|
||||
requires :directory
|
||||
super({ :directory => directory }.merge!(attributes))
|
||||
super({ :directory => directory }.merge(attributes))
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -78,7 +78,7 @@ module Fog
|
|||
end
|
||||
|
||||
# Merge in any remaining options (only 'description' should remain)
|
||||
body_object.merge(opts)
|
||||
body_object.merge!(opts)
|
||||
|
||||
result = self.build_result(api_method, parameters,
|
||||
body_object)
|
||||
|
|
|
@ -30,7 +30,7 @@ module Fog
|
|||
}
|
||||
|
||||
# Merge in the remaining params (only 'description' should remain)
|
||||
body_object.merge(options)
|
||||
body_object.merge!(options)
|
||||
|
||||
result = self.build_result(api_method,
|
||||
parameters,
|
||||
|
|
|
@ -174,7 +174,7 @@ module Fog
|
|||
if options['kernel']
|
||||
body_object['kernel'] = @api_url + "google/global/kernels/#{options.delete 'kernel'}"
|
||||
end
|
||||
body_object.merge! options # Adds in all remaining options that weren't explicitly handled.
|
||||
body_object.merge!(options) # Adds in all remaining options that weren't explicitly handled.
|
||||
|
||||
result = self.build_result(api_method, parameters,
|
||||
body_object=body_object)
|
||||
|
|
|
@ -26,7 +26,7 @@ module Fog
|
|||
# * 'LastModified'<~Time> - date object was last modified
|
||||
#
|
||||
def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
|
||||
headers = { 'x-goog-copy-source' => "/#{source_bucket_name}/#{source_object_name}" }.merge!(options)
|
||||
headers = { 'x-goog-copy-source' => "/#{source_bucket_name}/#{source_object_name}" }.merge(options)
|
||||
request({
|
||||
:expects => 200,
|
||||
:headers => headers,
|
||||
|
|
Loading…
Reference in a new issue