caterer 0.9.4 → 0.9.5

data/lib/caterer/provisioner/chef_solo.rb

@@ -46,7 +46,7 @@ module Caterer
 
         @run_list += provisioner.run_list
         @bootstrap_scripts += provisioner.bootstrap_scripts
-        @json = json.merge(image.json)
+        @json = @json.merge(provisioner.json)
       end
 
       def add_bootstrap(script)

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors: