diff options
| author | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-01-06 15:21:28 -0800 |
|---|---|---|
| committer | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-01-06 15:21:28 -0800 |
| commit | 11042288dac26ca2c632b44c6ce02a9cb99e4451 (patch) | |
| tree | 63f4400c12e8bc168ecb1e53a80a9fb305cec9ec | |
| parent | 13ef10c1c68c6e92f130435378295b75d8a3df70 (diff) | |
| parent | d8f3df78735e6b09d743f12b1042f57490496d51 (diff) | |
| download | chef-11042288dac26ca2c632b44c6ce02a9cb99e4451.tar.gz | |
Merge pull request #575 from chef/tball/chefdk_subfolder
ChefDK is getting cached in a subdirectory (chef-dk/chefdk)
| -rw-r--r-- | Gemfile.lock | 19 | ||||
| -rw-r--r-- | config/software/chefdk.rb | 3 |
2 files changed, 9 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 56011237d1..c9596a8d6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,7 +6,7 @@ GIT GIT remote: git://github.com/chef/omnibus.git - revision: 58f4b2622adc524aa7bd8a369938a0ea44aaf3aa + revision: f1231f74ebda76530e73fd6416e1ee7eb7be3656 specs: omnibus (5.0.0) aws-sdk (~> 2) @@ -22,12 +22,12 @@ GEM remote: https://rubygems.org/ specs: addressable (2.3.8) - aws-sdk (2.2.6) - aws-sdk-resources (= 2.2.6) - aws-sdk-core (2.2.6) + aws-sdk (2.2.9) + aws-sdk-resources (= 2.2.9) + aws-sdk-core (2.2.9) jmespath (~> 1.0) - aws-sdk-resources (2.2.6) - aws-sdk-core (= 2.2.6) + aws-sdk-resources (2.2.9) + aws-sdk-core (= 2.2.9) berkshelf (3.2.4) addressable (~> 2.3.4) berkshelf-api-client (~> 1.2) @@ -60,7 +60,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.5.1) + chef-config (12.6.0) mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) chef-sugar (3.2.0) @@ -84,7 +84,7 @@ GEM hitimes (1.2.2) hitimes (1.2.2-x86-mingw32) httpclient (2.6.0.1) - ipaddress (0.8.0) + ipaddress (0.8.2) jmespath (1.1.3) json (1.8.3) kitchen-vagrant (0.19.0) @@ -198,6 +198,3 @@ DEPENDENCIES omnibus-software! test-kitchen (~> 1.4.0) winrm-transport (~> 1.0) - -BUNDLED WITH - 1.10.6 diff --git a/config/software/chefdk.rb b/config/software/chefdk.rb index 67658d5e19..4f4938953a 100644 --- a/config/software/chefdk.rb +++ b/config/software/chefdk.rb @@ -21,7 +21,6 @@ source git: "git://github.com/chef/chef-dk.git" relative_path "chef-dk" - if windows? dependency "ruby-windows" dependency "ruby-windows-devkit" @@ -69,7 +68,7 @@ build do " --verbose", env: env appbundle 'berkshelf' - appbundle 'chef-dk' + appbundle 'chefdk' appbundle 'chef-vault' appbundle 'foodcritic' appbundle 'rubocop' |