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

Bump Chef to 14.2.0 + other bumps #1603

Merged
merged 2 commits into from
Jun 7, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ group(:omnibus_package) do
gem "chef-provisioning-aws", ">= 3.0.2", group: :provisioning
gem "chef-provisioning-fog", ">= 0.26.1", group: :provisioning
gem "chef-vault", ">= 3.3.0"
gem "chef", "= 14.1.12"
gem "chef", "= 14.2.0"
gem "cheffish", ">= 14.0.1"
gem "chefspec", ">= 7.2.0"
gem "fauxhai", ">= 5.4.0"
Expand Down
28 changes: 14 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,20 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (10.0.2)
chef (14.1.12)
chef (14.2.0)
addressable
bundler (>= 1.10)
chef-config (= 14.1.12)
chef-config (= 14.2.0)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi (< 1.9.22)
ffi (~> 1.9, >= 1.9.25)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
iso8601 (~> 0.9.1)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 2.0)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
mixlib-log (~> 2.0, >= 2.0.3)
mixlib-shellout (~> 2.0)
Expand All @@ -93,20 +93,20 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
chef (14.1.12-universal-mingw32)
chef (14.2.0-universal-mingw32)
addressable
bundler (>= 1.10)
chef-config (= 14.1.12)
chef-config (= 14.2.0)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi (< 1.9.22)
ffi (~> 1.9, >= 1.9.25)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
iso8601 (~> 0.9.1)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 2.0)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
mixlib-log (~> 2.0, >= 2.0.3)
mixlib-shellout (~> 2.0)
Expand Down Expand Up @@ -138,7 +138,7 @@ GEM
chef-api (0.8.0)
logify (~> 0.1)
mime-types
chef-config (14.1.12)
chef-config (14.2.0)
addressable
fuzzyurl
mixlib-config (~> 2.0)
Expand Down Expand Up @@ -246,9 +246,9 @@ GEM
http-cookie (~> 1.0.0)
fauxhai (6.2.0)
net-ssh
ffi (1.9.21)
ffi (1.9.21-x64-mingw32)
ffi (1.9.21-x86-mingw32)
ffi (1.9.25)
ffi (1.9.25-x64-mingw32)
ffi (1.9.25-x86-mingw32)
ffi-libarchive (0.2.0)
ffi (~> 1.0)
ffi-rzmq (2.0.6)
Expand Down Expand Up @@ -457,7 +457,7 @@ GEM
mini_portile2 (2.3.0)
minitar (0.6.1)
minitest (5.11.3)
mixlib-archive (0.4.6)
mixlib-archive (0.4.7)
mixlib-log
mixlib-authentication (2.1.0)
mixlib-cli (1.7.0)
Expand Down Expand Up @@ -736,7 +736,7 @@ DEPENDENCIES
artifactory
berkshelf (>= 7.0)
bundler
chef (= 14.1.12)
chef (= 14.2.0)
chef-dk!
chef-provisioning (>= 2.7.1)
chef-provisioning-aws (>= 3.0.2)
Expand Down
14 changes: 7 additions & 7 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: df6f7e3e464e7a12110d9dc880d591a086f5b902
revision: 54478c0b5ac4a2872c06025dfa6d9a10ed6db72d
branch: master
specs:
omnibus-software (4.0.0)
Expand Down Expand Up @@ -31,13 +31,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-sdk (2.11.62)
aws-sdk-resources (= 2.11.62)
aws-sdk-core (2.11.62)
aws-sdk (2.11.63)
aws-sdk-resources (= 2.11.63)
aws-sdk-core (2.11.63)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.62)
aws-sdk-core (= 2.11.62)
aws-sdk-resources (2.11.63)
aws-sdk-core (= 2.11.63)
aws-sigv4 (1.0.2)
berkshelf (6.3.2)
buff-config (~> 2.0)
Expand Down Expand Up @@ -186,7 +186,7 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.10)
minitar (0.6.1)
mixlib-archive (0.4.6)
mixlib-archive (0.4.7)
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
Expand Down