caterer 0.9.3 → 0.9.4

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.
Files changed (3) hide show
  1. data/lib/caterer/provisioner/chef_solo.rb +1 -0
  2. data/lib/caterer/version.rb +1 -1
  3. metadata +2 -2
data/lib/caterer/provisioner/chef_solo.rb CHANGED
@@ -46,6 +46,7 @@ module Caterer
46
46
 
47
47
  @run_list += provisioner.run_list
48
48
  @bootstrap_scripts += provisioner.bootstrap_scripts
49
+ @json = json.merge(image.json)
49
50
  end
50
51
 
51
52
  def add_bootstrap(script)
data/lib/caterer/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Caterer
2
- VERSION = "0.9.3"
2
+ VERSION = "0.9.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caterer
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.3
4
+ version: 0.9.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-14 00:00:00.000000000 Z
12
+ date: 2013-01-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: log4r