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

Merge pull request #867 from pomnikita/master

Allow for stringified options keys in Fog::Service#new
This commit is contained in:
Wesley Beary 2012-04-25 14:03:17 -07:00
commit 100807db74

View file

@ -48,6 +48,7 @@ module Fog
def new(options={}) def new(options={})
# attempt to load credentials from config file # attempt to load credentials from config file
options = Fog.symbolize_credentials(options)
begin begin
default_credentials = Fog.credentials.reject {|key, value| !(recognized | requirements).include?(key)} default_credentials = Fog.credentials.reject {|key, value| !(recognized | requirements).include?(key)}
options = default_credentials.merge(options) options = default_credentials.merge(options)