aws-sdk-resources 2.2.29 → 2.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a2da47aee83678088797a524c2a1b3244bbd89
-  data.tar.gz: 819d9001335e306650cbd2cd6d79cf3c500fa355
+  metadata.gz: 51d6e35711f7d78143aaf524e34987478c019303
+  data.tar.gz: 127c53c635d4cc51efe9633845abd57116e849d7
 SHA512:
-  metadata.gz: ce6ad7c48f7346117b1a6eba3ea2df2c41bacf6cdd18714c693e7234b7ba413dd211d97062c796d2e26436845f3593d01165c6774351c22d867ed47721e962e2
-  data.tar.gz: 5e8e64439583461721bae6bea4ae448daadb3287d5e14379a0ea934e233d5477e0324125d1ec478cde4e382109947f71a804758c1d06c6a762db8707326525d0
+  metadata.gz: 16680def905373105b9d43b0356e6e626bc19e88335b485e3226c2f74a142d12a9fd4fb96ea31502e0ce75b81c8cab8fae0d4c283cc1aa4154093fccd2c6bcb1
+  data.tar.gz: cd198b3086622a36a23a905f8c48d267ba4f68729885506ebc9efd02d54c6bc9b728c8cd8c18a5a0a03350e7df1b9c8df944e30134f1ad7ce367f3625ece9f65

data/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb

@@ -68,7 +68,7 @@ You can modify defaults and register callbacks by passing a block argument.
      w.before_wait do { |count, prev_resp| ... }
   end
           EXAMPLE
-          super + [tag(example)]
+          [tag(example)]
         end
 
       end

data/lib/aws-sdk-resources/operations.rb

@@ -214,9 +214,7 @@ module Aws
             param.apply(params_hash, options)
           end
 
-          user_params = options[:params] || {}
-          params = deep_merge(user_params, params_hash)
-          resp = resource.client.wait_until(@waiter_name, params, &options[:block])
+          resp = resource.client.wait_until(@waiter_name, params_hash, &options[:block])
 
           resource_opts = resource.identifiers.dup
           if @path && resp.respond_to?(:data)
@@ -226,14 +224,6 @@ module Aws
           resource.class.new(resource_opts)
         end
 
-        def deep_merge(obj1, obj2)
-          case obj1
-          when Hash then obj1.merge(obj2) { |key, v1, v2| deep_merge(v1, v2) }
-          when Array then obj2 + obj1
-          else obj2
-          end
-        end
-
       end
 
       # @api private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.2.29
+  version: 2.2.30
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.29
+        version: 2.2.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.29
+        version: 2.2.30
 description: Provides resource oriented interfaces and other higher-level abstractions
   for many AWS services. This gem is part of the official AWS SDK for Ruby.
 email: