Skip to content

Lbaker/chef 23732 #4059

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

Open
lbakerchef wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Lbaker/chef 23732 #4059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3fa2340
Upgrade chef gem to 18.7.10
chef-ci Jul 31, 2025
7a4b74c
changes are result of doing bundle update after rebase to remove inco…
talktovikas Aug 13, 2025
cb44502
reverting back the omnibus revison tag.
talktovikas Aug 13, 2025
b4e3db3
update chef to 18.8.9
lbakerchef Aug 13, 2025
ef2f454
resolve http-accept dependency conflict
lbakerchef Aug 14, 2025
8b90bed
Revert "resolve http-accept dependency conflict"
lbakerchef Aug 14, 2025
7df4883
resolve http-accept dependency conflict
lbakerchef Aug 14, 2025
31fa185
regen omnibus/partybus/Gemfile.lock
lbakerchef Aug 14, 2025
efdca44
edits
lbakerchef Aug 15, 2025
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 VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.10.52
15.10.52
2 changes: 2 additions & 0 deletions chef_fixie-deps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Successfully installed bundler-2.6.9
1 gem installed
4 changes: 3 additions & 1 deletion oc-chef-pedant/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
source "https://rubygems.org"

gemspec
# Fix gem conflict with http-accept 1.7.0 by adding explicit dependency for version 2.1.1
gem "http-accept", "2.1.1"
# For debugging in dvm
gem "pry"
gem "pry-byebug"
Expand All @@ -10,7 +12,7 @@ gem "rake"
# We require chef internally to get the version in
# lib/pedant/request.rb. It's really strange code and it should be
# revisited.
gem "chef", "17.10.0"
gem "chef", "18.8.9"

# For "rake chef_zero_spec"
# gem 'chef-zero', github: 'chef/chef-zero'
Expand Down
Loading
Loading