summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile.lock19
-rw-r--r--config/software/chefdk.rb3
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'