diff options
author | Jaymala Sinha <jsinha@chef.io> | 2017-07-21 16:48:02 -0400 |
---|---|---|
committer | Jaymala Sinha <jsinha@chef.io> | 2017-07-25 17:02:23 -0400 |
commit | d5a0862b96870ea9960be7adb9a2ac13dbae9041 (patch) | |
tree | e15e6bb1fd5c761d3e198cfb91b9ca83dae7fbe2 /omnibus | |
parent | 10931767df7f7f82d0adf322da66032169e39a84 (diff) | |
download | chef-d5a0862b96870ea9960be7adb9a2ac13dbae9041.tar.gz |
[BEN-180] Rename resource template in chef-12 and update omnibus
Signed-off-by: Jaymala Sinha <jsinha@chef.io>
Diffstat (limited to 'omnibus')
-rw-r--r-- | omnibus/Gemfile.lock | 42 | ||||
-rw-r--r-- | omnibus/resources/chef/ips/chef-symlinks.erb (renamed from omnibus/resources/chef/ips/symlinks.erb) | 0 |
2 files changed, 21 insertions, 21 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 879c37c538..d58638e7cc 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/license_scout - revision: e9c48c6773dec6fd718642194bfcb166d5685e03 + revision: e0d15c52f29dadc8d057616dfadd2c39bfc24beb specs: license_scout (0.1.3) ffi-yajl (~> 2.2) @@ -8,9 +8,9 @@ GIT GIT remote: https://github.com/chef/omnibus - revision: 0212438d74eb408791724d737afba83868e416ed + revision: 2215d10c1d13c30f058f126806bff09807706c41 specs: - omnibus (5.5.0) + omnibus (5.6.1) aws-sdk (~> 2) chef-sugar (~> 3.3) cleanroom (~> 1.0) @@ -25,11 +25,11 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 266a8ab07b0380607ce8a6ec5fd824ea002be2f1 + revision: a5184e2d973352d93923b4e979479e079b80364d specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) - omnibus (>= 5.5.0) + omnibus (>= 5.6.1) GEM remote: https://rubygems.org/ @@ -37,15 +37,15 @@ GEM addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) artifactory (2.8.2) - awesome_print (1.7.0) - aws-sdk (2.9.41) - aws-sdk-resources (= 2.9.41) - aws-sdk-core (2.9.41) + awesome_print (1.8.0) + aws-sdk (2.10.16) + aws-sdk-resources (= 2.10.16) + aws-sdk-core (2.10.16) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.9.41) - aws-sdk-core (= 2.9.41) - aws-sigv4 (1.0.0) + aws-sdk-resources (2.10.16) + aws-sdk-core (= 2.10.16) + aws-sigv4 (1.0.1) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (~> 2.0, >= 2.0.2) @@ -85,12 +85,12 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (13.1.31) + chef-config (13.2.20) addressable fuzzyurl mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-sugar (3.4.0) + chef-sugar (3.5.0) cleanroom (1.0.0) coderay (1.1.1) debug_inspector (0.0.3) @@ -99,14 +99,14 @@ GEM multipart-post (>= 1.2, < 3) ffi (1.9.18) ffi (1.9.18-x86-mingw32) - ffi-yajl (2.3.0) + ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashie (3.5.5) + hashie (3.5.6) hitimes (1.2.5) hitimes (1.2.5-x86-mingw32) httpclient (2.7.2) @@ -135,11 +135,11 @@ GEM mixlib-versioning thor mixlib-log (1.7.1) - mixlib-shellout (2.2.7) - mixlib-shellout (2.2.7-universal-mingw32) + mixlib-shellout (2.3.2) + mixlib-shellout (2.3.2-universal-mingw32) win32-process (~> 0.8.2) wmi-lite (~> 1.0) - mixlib-versioning (1.1.0) + mixlib-versioning (1.2.1) molinillo (0.4.5) multi_json (1.12.1) multipart-post (2.0.0) @@ -152,7 +152,7 @@ GEM nori (2.6.0) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.24.0) + ohai (8.24.1) chef-config (>= 12.5.0.alpha.1, < 14) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -266,4 +266,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.12.5 + 1.15.3 diff --git a/omnibus/resources/chef/ips/symlinks.erb b/omnibus/resources/chef/ips/chef-symlinks.erb index 419d52ddf7..419d52ddf7 100644 --- a/omnibus/resources/chef/ips/symlinks.erb +++ b/omnibus/resources/chef/ips/chef-symlinks.erb |