Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Update Chef Infra Client to 15.0.300 #2090

Merged
merged 1 commit into from
May 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ group(:omnibus_package) do
# gems to Rubygems now, so letting this float on latest should always give us the latest
# stable release. May have to re-pin around major version bumping time, or during patch
# fixes.
gem "chef", "= 15.0.298"
gem "chef-bin", "= 15.0.298"
gem "chef", "= 15.0.300"
gem "chef-bin", "= 15.0.300"
gem "cheffish", ">= 14.0.1"
gem "chefspec", ">= 7.3.0"
gem "fauxhai", "~> 7.0"
Expand Down
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ GEM
aws-sdk-rds (1.52.0)
aws-sdk-core (~> 3, >= 3.52.1)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.38.0)
aws-sdk-s3 (1.39.0)
aws-sdk-core (~> 3, >= 3.52.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
Expand Down Expand Up @@ -117,11 +117,11 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (11.0.1)
chef (15.0.298)
chef (15.0.300)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.0.298)
chef-config (= 15.0.300)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand All @@ -147,11 +147,11 @@ GEM
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
chef (15.0.298-universal-mingw32)
chef (15.0.300-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.0.298)
chef-config (= 15.0.300)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand Down Expand Up @@ -206,9 +206,9 @@ GEM
toml-rb
train
tty-spinner
chef-bin (15.0.298)
chef (= 15.0.298)
chef-config (15.0.298)
chef-bin (15.0.300)
chef (= 15.0.300)
chef-config (15.0.300)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
Expand Down Expand Up @@ -864,9 +864,9 @@ DEPENDENCIES
bcrypt_pbkdf
berkshelf (>= 7.0.5)
bundler
chef (= 15.0.298)
chef (= 15.0.300)
chef-apply
chef-bin (= 15.0.298)
chef-bin (= 15.0.300)
chef-dk!
chef-sugar
chef-vault (>= 3.4.1)
Expand Down
4 changes: 2 additions & 2 deletions lib/chef-dk/command/verify.rb
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def components
c.smoke_test do
tmpdir do |cwd|
FileUtils.touch(File.join(cwd, "apply.rb"))
sh("#{bin("chef-apply")} apply.rb", cwd: cwd)
sh("#{bin("chef-apply")} apply.rb --chef-license 'accept-no-persist'", cwd: cwd)
end
end
end
Expand Down Expand Up @@ -423,7 +423,7 @@ def components
end
EOF
end
sh("chef-apply foo.rb", cwd: cwd)
sh("chef-apply foo.rb --chef-license 'accept-no-persist'", cwd: cwd)
end
end
end
Expand Down