vmware-vra 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac729199b904cd20391694456f20306e8b11e5f
-  data.tar.gz: 5b98695fbb10313a0c3d836cf132a7ce31eccf2b
+  metadata.gz: c5dcc8f5abbb59b980895b3970c86f73e49fe379
+  data.tar.gz: 78746f7b4706f0ae7adcce6cffcd8a2f5fd178c2
 SHA512:
-  metadata.gz: 06157a18438d667f5ac70aaea02d9ee9894473655ecb545a952ac151428242d62b82b6bfaf7e407417c7510a045fb69ec811db627dcd9d0aa16c316b2a9bd88a
-  data.tar.gz: 846208751739fe7ba682d9fc879f9590a137e9a6a25f2154ce5352fbd630819ac33079ef890339aafffcb4230b9ab64e55df6c713f567bcac3c4b77cacb4ed91
+  metadata.gz: 26479fc2672a80ddf7b83f9b5bafedbe803304b1f580ffcd7603512f08a8e936d7b14933c36be801a010728441c0502cc55d7822c9591eb5b5c9bc9b6cfa294a
+  data.tar.gz: ccd9fdf91aa926facc9bb8d8819fa73a653217b349ea79da6bc490917df1958a9ab5346d8f48c0090a4c764ba84303297997a6a8b2ddc1e604503963a3fafbaa

data/CHANGELOG.md

@@ -1,7 +1,17 @@
 # Change Log
 
-## [v2.6.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.6.0)
+## [2.6.1](https://github.com/chef-partners/vmware-vra-gem/tree/2.6.1) (2018-07-31)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.6.0...2.6.1)
 
+**Closed issues:**
+
+- Vra::Resource\#ip\_addresses non-deterministically returns an empty array in error [\#65](https://github.com/chef-partners/vmware-vra-gem/issues/65)
+
+**Merged pull requests:**
+
+- Removed the deep merge [\#68](https://github.com/chef-partners/vmware-vra-gem/pull/68) ([jjasghar](https://github.com/jjasghar))
+
+## [v2.6.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.6.0) (2018-03-01)
 [Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.5.2...v2.6.0)
 
 **Closed issues:**
@@ -266,4 +276,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/vra/catalog_request.rb

@@ -96,7 +96,6 @@ module Vra
       hash_payload["requestedFor"] = @requested_for
       hash_payload["data"]["_leaseDays"] = @lease_days
       hash_payload["description"] = @notes
-      JSON.pretty_generate(deep_merge(hash_payload, parameters))
     end
 
     # @return [String] - the current catalog template payload merged with the settings applied from this request
@@ -114,7 +113,7 @@ module Vra
       validate_params!
 
       begin
-        post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests", merged_payload)
+        post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests", template_payload)
       rescue Vra::Exception::HTTPError => e
         raise Vra::Exception::RequestError, "Unable to submit request: #{e.errors.join(', ')}"
       rescue
@@ -123,22 +122,5 @@ module Vra
       request_id = JSON.parse(post_response.body)["id"]
       Vra::Request.new(client, request_id)
     end
-
-    def deep_merge(first, second)
-      merger = proc do |key, v1, v2|
-        if Hash === v1 && Hash === v2
-          v1.merge(v2, &merger)
-        elsif Array === v1 && Array === v2
-          v1 | v2
-        elsif [:undefined, nil, :nil].include?(v2)
-          v1
-        else
-          v2
-        end
-      end
-      first.merge(second.to_h, &merger)
-    end
-
-    private :deep_merge
   end
 end

data/lib/vra/version.rb

@@ -18,5 +18,5 @@
 #
 
 module Vra
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Adam Leff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl