Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Chef to 15.4 and remove explicit rubocop from the Gemfile #601

Merged
merged 1 commit into from
Oct 23, 2019
Merged

Update Chef to 15.4 and remove explicit rubocop from the Gemfile #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions components/gems/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,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.3.14"
gem "chef-bin", "= 15.3.14"
gem "chef", "= 15.4.45"
gem "chef-bin", "= 15.4.45"
gem "ohai", ">= 14"
gem "cheffish", ">= 14.0.1"

Expand Down Expand Up @@ -110,7 +110,6 @@ group(:omnibus_package) do
gem "pry-remote"
gem "pry-stack_explorer"
gem "rb-readline"
gem "rubocop"
gem "winrm-fs"
gem "winrm-elevated"
gem "stove", ">= 7.1.5"
Expand Down
27 changes: 13 additions & 14 deletions components/gems/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (11.0.1)
chef (15.3.14)
chef (15.4.45)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.3.14)
chef-config (= 15.4.45)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand All @@ -220,15 +220,15 @@ GEM
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
train-core (~> 3.0)
train-winrm
train-core (~> 3.1)
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
chef (15.3.14-universal-mingw32)
chef (15.4.45-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.3.14)
chef-config (= 15.4.45)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand All @@ -252,8 +252,8 @@ GEM
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
train-core (~> 3.0)
train-winrm
train-core (~> 3.1)
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
win32-api (~> 1.5.3)
Expand Down Expand Up @@ -285,8 +285,8 @@ GEM
train (~> 3.0)
train-winrm
tty-spinner
chef-bin (15.3.14)
chef (= 15.3.14)
chef-bin (15.4.45)
chef (= 15.4.45)
chef-cli (2.0.0)
addressable (>= 2.3.5, < 2.6)
chef (>= 14.0)
Expand All @@ -299,7 +299,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
paint (~> 1.0)
solve (> 2.0, < 5.0)
chef-config (15.3.14)
chef-config (15.4.45)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
Expand Down Expand Up @@ -998,9 +998,9 @@ DEPENDENCIES
bcrypt_pbkdf
berkshelf (>= 7.0.8)
bundler (< 2)
chef (= 15.3.14)
chef (= 15.4.45)
chef-apply (>= 0.3.3)
chef-bin (= 15.3.14)
chef-bin (= 15.4.45)
chef-cli (>= 1.0.9)
chef-sugar-ng
chef-vault (>= 3.4.1)
Expand Down Expand Up @@ -1054,7 +1054,6 @@ DEPENDENCIES
rb-readline
rdoc (<= 6.0.1)
rdp-ruby-wmi
rubocop
ruby-prof
ruby-shadow
stove (>= 7.1.5)
Expand Down