knife-zero 1.10.1 → 1.10.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a2bb6e65d65c797e4e2613355d98d7a26811fef0
4
- data.tar.gz: 55bcc60520eefa2cfc1559f70500c5c3e43ebbf0
3
+ metadata.gz: 06a7110f13cc319dbdfa486c76fd6d36c4b02a03
4
+ data.tar.gz: 78a63c938cf105802a63a1d134fa6985c36d72b3
5
5
  SHA512:
6
- metadata.gz: 96fb4d14b34ab8ea3fecbe25bac3a757b770163b91fee605929d8e5bf5cdea9a70b20dc8b67e1619ca61e56057fd3b74732e5937ef7f135e6ded8eb2aab0079b
7
- data.tar.gz: 0a5beec96c839b06aef0b54acb7094061567709a6eace161cfaac1feb901b2e1e96dac7ef42f4f96a714542570115837f5990b2d8a7279ec03ef548f531a394f
6
+ metadata.gz: 467b5875ee53e14272dfd9e39c2c6514f741185707bc23040a462e2bc55afbdf65ef06ce417d9f0e1c92dd7d1fe701b4447755207b08699eaf685698b8fa13c5
7
+ data.tar.gz: 73ca397b8343ace527d50460038a4b951df9d570955e5a8c987cf55b25356848ea19f4ee4b42048eea97622dae72794cd75b964167d178e4bd3a072a38fe132d
data/CHANGELOG.md CHANGED
@@ -2,6 +2,10 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
+ ## v1.10.2
6
+
7
+ - Bugfix: `--json-attribute` was broken. #73
8
+
5
9
  ## v1.10.1
6
10
 
7
11
  - Fix: knife zero bootstrap broken by knife rehash #70
@@ -69,7 +69,11 @@ class Chef
69
69
  if @config[:first_boot_attributes_from_file]
70
70
  @config[:first_boot_attributes_from_file] = @config[:first_boot_attributes_from_file].merge(build_knifezero_attributes_for_node)
71
71
  else
72
- @config[:first_boot_attributes] = build_knifezero_attributes_for_node
72
+ if @config[:first_boot_attributes]
73
+ @config[:first_boot_attributes] = @config[:first_boot_attributes].merge(build_knifezero_attributes_for_node)
74
+ else
75
+ @config[:first_boot_attributes] = build_knifezero_attributes_for_node
76
+ end
73
77
  end
74
78
  super
75
79
  end
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module Zero
3
- VERSION = "1.10.1"
3
+ VERSION = "1.10.2"
4
4
  MAJOR, MINOR, TINY = VERSION.split('.')
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-zero
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.1
4
+ version: 1.10.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - sawanoboly
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-24 00:00:00.000000000 Z
11
+ date: 2015-12-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler