knife-zero 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2bb6e65d65c797e4e2613355d98d7a26811fef0
-  data.tar.gz: 55bcc60520eefa2cfc1559f70500c5c3e43ebbf0
+  metadata.gz: 06a7110f13cc319dbdfa486c76fd6d36c4b02a03
+  data.tar.gz: 78a63c938cf105802a63a1d134fa6985c36d72b3
 SHA512:
-  metadata.gz: 96fb4d14b34ab8ea3fecbe25bac3a757b770163b91fee605929d8e5bf5cdea9a70b20dc8b67e1619ca61e56057fd3b74732e5937ef7f135e6ded8eb2aab0079b
-  data.tar.gz: 0a5beec96c839b06aef0b54acb7094061567709a6eace161cfaac1feb901b2e1e96dac7ef42f4f96a714542570115837f5990b2d8a7279ec03ef548f531a394f
+  metadata.gz: 467b5875ee53e14272dfd9e39c2c6514f741185707bc23040a462e2bc55afbdf65ef06ce417d9f0e1c92dd7d1fe701b4447755207b08699eaf685698b8fa13c5
+  data.tar.gz: 73ca397b8343ace527d50460038a4b951df9d570955e5a8c987cf55b25356848ea19f4ee4b42048eea97622dae72794cd75b964167d178e4bd3a072a38fe132d

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.10.2
+
+- Bugfix: `--json-attribute` was broken. #73
+
 ## v1.10.1
 
 - Fix: knife zero bootstrap broken by knife rehash #70

data/lib/chef/knife/zero_bootstrap.rb

@@ -69,7 +69,11 @@ class Chef
         if @config[:first_boot_attributes_from_file]
           @config[:first_boot_attributes_from_file] = @config[:first_boot_attributes_from_file].merge(build_knifezero_attributes_for_node)
         else
-          @config[:first_boot_attributes] = build_knifezero_attributes_for_node
+          if @config[:first_boot_attributes]
+            @config[:first_boot_attributes] = @config[:first_boot_attributes].merge(build_knifezero_attributes_for_node)
+          else
+            @config[:first_boot_attributes] = build_knifezero_attributes_for_node
+          end
         end
         super
       end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.10.1"
+    VERSION = "1.10.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler