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

Merge branch 'master' of github.com:fog/fog into network_fix

Browse source
This commit is contained in:
Kyle Rames 2013-04-19 07:39:34 -05:00
commit 12f36dff78
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/internet_archive/models/storage/ia_attributes.rb
View file

@ -3,7 +3,7 @@ module Fog
module IAAttributes
# you can add other x-archive-metadata-* values, but these are standard
IA_STANDARD_METADATA_FIELDS = %q[hidden, title, collection, creator, mediatype, description, date, subject, licenseurl , pick, noindex, notes, rights, contributor, language, coverage, credits]
IA_STANDARD_METADATA_FIELDS = %q[hidden, title, collection, creator, mediatype, description, date, subject, licenseurl, pick, noindex, notes, rights, contributor, language, coverage, credits]
# for x-archive-metadata-mediatype, these are the valid values
IA_VALID_MEDIA_TYPES = %q[audio, data, etree, image, movies, software, texts, web]

3
lib/fog/internet_archive/requests/storage/head_object.rb
View file

@ -41,8 +41,7 @@ module Fog
:host => "#{bucket_name}.#{@host}",
:idempotent => true,
:method => 'HEAD',
:path => CGI.escape(object_name),
:query => query
:path => CGI.escape(object_name)
})
end

1
lib/fog/rackspace/requests/compute_v2/create_server.rb
View file

@ -51,7 +51,6 @@ module Fog
}
}
data['server']['metadata'] = options[:metadata] unless options[:metadata].nil?
data['server']['OS-DCF:diskConfig'] = options[:disk_config] unless options[:disk_config].nil?
data['server']['metadata'] = options[:metadata] unless options[:metadata].nil?
data['server']['personality'] = options[:personality] unless options[:personality].nil?