summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-01-04 17:09:30 -0800
committerTim Smith <tsmith84@gmail.com>2021-01-04 17:09:30 -0800
commitc13e7f4800c85c435480c0ed30b1bcd2782ab021 (patch)
treecf8f077d256098527e4eef0ab64f95380ee12d81
parent35f61476c322fb1b568779ee45f46dad634572fe (diff)
downloadohai-c13e7f4800c85c435480c0ed30b1bcd2782ab021.tar.gz
Update master ohai to pull from master chef
I opened the previous PR against the wrong branch Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index fdd28524..09c6193a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,8 +4,8 @@ source "https://rubygems.org"
gemspec
# pull these gems from master of chef/chef so that we're testing against what we will release
-gem "chef-config", git: "https://github.com/chef/chef", branch: "chef-16", glob: "chef-config/chef-config.gemspec"
-gem "chef-utils", git: "https://github.com/chef/chef", branch: "chef-16", glob: "chef-utils/chef-utils.gemspec"
+gem "chef-config", git: "https://github.com/chef/chef", branch: "master", glob: "chef-config/chef-config.gemspec"
+gem "chef-utils", git: "https://github.com/chef/chef", branch: "master", glob: "chef-utils/chef-utils.gemspec"
# NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
group :development do