Merge branch 'master' of github.com:fog/fog into tweak_gemfile
Conflicts: fog.gemspec
This commit is contained in:
commit
1f63772dcf
10
fog.gemspec
10
fog.gemspec
|
@ -41,16 +41,10 @@ Gem::Specification.new do |s|
|
||||||
|
|
||||||
## List your runtime dependencies here. Runtime dependencies are those
|
## List your runtime dependencies here. Runtime dependencies are those
|
||||||
## that are needed for an end user to actually USE your code.
|
## that are needed for an end user to actually USE your code.
|
||||||
s.add_dependency("fog-core", "~> 1.21")
|
s.add_dependency("fog-core", "~> 1.21", ">= 1.21.1")
|
||||||
s.add_dependency("fog-json")
|
s.add_dependency("fog-json")
|
||||||
|
|
||||||
s.add_dependency('builder')
|
s.add_dependency('nokogiri', '~> 1.5', '>= 1.5.11')
|
||||||
s.add_dependency('excon', '~> 0.31')
|
|
||||||
s.add_dependency('formatador', '~>0.2')
|
|
||||||
s.add_dependency('mime-types')
|
|
||||||
s.add_dependency('net-scp', '~> 1.1')
|
|
||||||
s.add_dependency('net-ssh', '>= 2.1.3')
|
|
||||||
s.add_dependency('nokogiri', '>= 1.5.11')
|
|
||||||
|
|
||||||
# Modular providers
|
# Modular providers
|
||||||
s.add_dependency("fog-brightbox")
|
s.add_dependency("fog-brightbox")
|
||||||
|
|
|
@ -32,6 +32,8 @@ module Fog
|
||||||
:aliases => 'CacheSubnetGroupName'
|
:aliases => 'CacheSubnetGroupName'
|
||||||
attribute :vpc_security_groups,
|
attribute :vpc_security_groups,
|
||||||
:aliases => 'VpcSecurityGroups', :type => :array
|
:aliases => 'VpcSecurityGroups', :type => :array
|
||||||
|
attribute :s3_snapshot_location,
|
||||||
|
:aliases => 'SnapshotArns', :type => :array
|
||||||
|
|
||||||
attr_accessor :parameter_group_name
|
attr_accessor :parameter_group_name
|
||||||
|
|
||||||
|
@ -63,6 +65,7 @@ module Fog
|
||||||
:port => port,
|
:port => port,
|
||||||
:preferred_availablility_zone => zone,
|
:preferred_availablility_zone => zone,
|
||||||
:preferred_maintenance_window => maintenance_window,
|
:preferred_maintenance_window => maintenance_window,
|
||||||
|
:s3_snapshot_location => s3_snapshot_location,
|
||||||
:parameter_group_name => parameter_group_name || parameter_group['CacheParameterGroupName'],
|
:parameter_group_name => parameter_group_name || parameter_group['CacheParameterGroupName'],
|
||||||
:cache_subnet_group_name => cache_subnet_group_name,
|
:cache_subnet_group_name => cache_subnet_group_name,
|
||||||
:vpc_security_groups => vpc_security_groups,
|
:vpc_security_groups => vpc_security_groups,
|
||||||
|
|
|
@ -23,6 +23,7 @@ module Fog
|
||||||
# * :preferred_availablility_zone <~String>
|
# * :preferred_availablility_zone <~String>
|
||||||
# * :preferred_maintenance_window <~String>
|
# * :preferred_maintenance_window <~String>
|
||||||
# * :cache_subnet_group_name <~String>
|
# * :cache_subnet_group_name <~String>
|
||||||
|
# * :s3_snapshot_location <~String> - Amazon resource location for snapshot
|
||||||
# === Returns
|
# === Returns
|
||||||
# * response <~Excon::Response>:
|
# * response <~Excon::Response>:
|
||||||
# * body <~Hash>
|
# * body <~Hash>
|
||||||
|
@ -45,6 +46,10 @@ module Fog
|
||||||
:parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new
|
:parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if s3_snapshot_location = options.delete(:s3_snapshot_location)
|
||||||
|
req_options.merge!(Fog::AWS.indexed_param('SnapshotArns.member.%d', [*s3_snapshot_location]))
|
||||||
|
end
|
||||||
|
|
||||||
if cache_security_groups = options.delete(:security_group_names)
|
if cache_security_groups = options.delete(:security_group_names)
|
||||||
req_options.merge!(Fog::AWS.indexed_param('CacheSecurityGroupNames.member.%d', [*cache_security_groups]))
|
req_options.merge!(Fog::AWS.indexed_param('CacheSecurityGroupNames.member.%d', [*cache_security_groups]))
|
||||||
end
|
end
|
||||||
|
|
|
@ -99,7 +99,7 @@ module Fog
|
||||||
requires :name
|
requires :name
|
||||||
requires :zone_name
|
requires :zone_name
|
||||||
|
|
||||||
if snap_name.nil? or snap_name.empty?
|
if snapshot_name.nil? or snapshot_name.empty?
|
||||||
raise ArgumentError, 'Invalid snapshot name'
|
raise ArgumentError, 'Invalid snapshot name'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ module Fog
|
||||||
if v2_authentication?
|
if v2_authentication?
|
||||||
:authenticate_v2
|
:authenticate_v2
|
||||||
else
|
else
|
||||||
Fog::Logger.deprecation "Authentication using a v1.0/v1.1 endpoint is deprecated. Please specify a v2.0 endpoint using :rackpace_auth_url.\
|
Fog::Logger.deprecation "Authentication using a v1.0/v1.1 endpoint is deprecated. Please specify a v2.0 endpoint using :rackspace_auth_url.\
|
||||||
For a list of v2.0 endpoints refer to http://docs.rackspace.com/auth/api/v2.0/auth-client-devguide/content/Endpoints-d1e180.html"
|
For a list of v2.0 endpoints refer to http://docs.rackspace.com/auth/api/v2.0/auth-client-devguide/content/Endpoints-d1e180.html"
|
||||||
:authenticate_v1
|
:authenticate_v1
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue