Merge branch 'bump_chef' into 'master'

Bump chef version to 12.4.0.rc.0.

Fixes #584

See merge request !359
This commit is contained in:
Marin Jankovski 2015-05-27 15:23:38 +00:00
commit b1a3870bd5
1 changed files with 2 additions and 2 deletions

View File

@ -44,7 +44,7 @@ build_iteration 1
override :ruby, version: '2.1.6', source: { md5: "6e5564364be085c45576787b48eeb75f" }
override :rubygems, version: '2.2.1'
override :'chef-gem', version: '11.18.0'
override :chef, version: '12.4.0.rc.0'
override :'omnibus-ctl', version: '0.3.4'
override :zlib, version: '1.2.8'
override :cacerts, version: '2015.04.22', source: { md5: '380df856e8f789c1af97d0da9a243769' }
@ -59,7 +59,7 @@ dependency "package-scripts"
dependency "git"
dependency "redis"
dependency "nginx"
dependency "chef-gem"
dependency "chef"
dependency "remote-syslog" if ee
dependency "logrotate"
dependency "runit"