diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-30 16:18:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 16:18:14 -0700 |
| commit | dac0b235fbf912899373c2361d2e3d594b1e0d70 (patch) | |
| tree | 0907cb871c6cb01ff41979a51e0de9c41109cf9b | |
| parent | d1f452b6d2daebd41ba72f329625f76c50b7d55b (diff) | |
| parent | 147d10b9baee2e77450c08b9ddc509ef3649f593 (diff) | |
| download | chef-dac0b235fbf912899373c2361d2e3d594b1e0d70.tar.gz | |
Merge pull request #7821 from chef/fix_kitchen_tests
Pull ohai from the 14-stable branch in kitchen tests
| -rw-r--r-- | kitchen-tests/Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 8881eb4e45..c571298fc2 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "rake" # required to build some native extensions gem "chef", path: ".." -gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" # avoids failures when we bump chef major +gem "ohai", git: "https://github.com/chef/ohai.git", branch: "14-stable" # avoids failures when we bump chef major gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master" gem "kitchen-appbundle-updater" gem "kitchen-dokken", "< 2.0" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787 |