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

Commit

Permalink
Merge pull request #2925 from chef/bump_chef_15
Browse files Browse the repository at this point in the history
Update Chef to 15.11.8
  • Loading branch information
tas50 authored Jun 1, 2020
2 parents 7baf338 + 3f8ec0c commit 635edaf
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,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.11.3"
gem "chef-bin", "= 15.11.3"
gem "chef", "= 15.11.8"
gem "chef-bin", "= 15.11.8"
gem "ohai", ">= 15"
gem "cheffish", ">= 15", "< 16"
gem "chef-zero", ">= 15", "< 16"
Expand Down
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,12 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.3)
chef (15.11.3)
chef (15.11.8)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.11.3)
chef-utils (= 15.11.3)
chef-config (= 15.11.8)
chef-utils (= 15.11.8)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand All @@ -249,12 +249,12 @@ GEM
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
chef (15.11.3-universal-mingw32)
chef (15.11.8-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.11.3)
chef-utils (= 15.11.3)
chef-config (= 15.11.8)
chef-utils (= 15.11.8)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand Down Expand Up @@ -296,11 +296,11 @@ GEM
chef-api (0.10.5)
mime-types
mixlib-log (>= 1, < 4)
chef-bin (15.11.3)
chef (= 15.11.3)
chef-config (15.11.3)
chef-bin (15.11.8)
chef (= 15.11.8)
chef-config (15.11.8)
addressable
chef-utils (= 15.11.3)
chef-utils (= 15.11.8)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
Expand All @@ -310,7 +310,7 @@ GEM
chef-config
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
chef-utils (15.11.3)
chef-utils (15.11.8)
chef-vault (4.0.1)
chef-zero (15.0.0)
ffi-yajl (~> 2.2)
Expand Down Expand Up @@ -979,8 +979,8 @@ DEPENDENCIES
artifactory
bcrypt_pbkdf (>= 1.1.0.rc1)
berkshelf (>= 7.0.9)
chef (= 15.11.3)
chef-bin (= 15.11.3)
chef (= 15.11.8)
chef-bin (= 15.11.8)
chef-dk!
chef-sugar
chef-telemetry (>= 1.0.8)
Expand Down
8 changes: 4 additions & 4 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ GEM
specs:
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
artifactory (3.0.13)
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
aws-partitions (1.322.0)
Expand Down Expand Up @@ -171,9 +171,9 @@ GEM
erubis (2.7.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
ffi (1.12.2-x64-mingw32)
ffi (1.12.2-x86-mingw32)
ffi (1.13.0)
ffi (1.13.0-x64-mingw32)
ffi (1.13.0-x86-mingw32)
ffi-libarchive (1.0.0)
ffi (~> 1.0)
ffi-win32-extensions (1.0.3)
Expand Down

0 comments on commit 635edaf

Please sign in to comment.