summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2020-07-24 11:16:10 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2020-07-24 11:16:10 -0700
commit2e628c17c9b9b34b3e04d1d130d2d5ea7cd1448d (patch)
tree069cfe4310f1d16dfb7dadab2d9811ba6eb5c997
parent8230c4d9d3cc8870632124f1bd92534a331d6893 (diff)
downloadchef-lcg/revert-default-paths.tar.gz
pin mixlib-shellout to before default_pathslcg/revert-default-paths
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock9
2 files changed, 7 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index bc74f62960..f3610ebd2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,8 @@ end
gem "cheffish", ">= 14"
+gem "mixlib-shellout", "= 3.1.1"
+
gem "chef-telemetry", ">=1.0.8" # 1.0.8 removes the http dep
group(:omnibus_package) do
diff --git a/Gemfile.lock b/Gemfile.lock
index edbed39884..a9ae78474c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 17cdaa58cb90d29134c7af2604c38b5b45f22ef3
+ revision: 5a1bce1ca8bf3310f14632c28ed0f0e9b04ec2f9
branch: master
specs:
- ohai (16.3.0)
+ ohai (16.3.1)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
@@ -255,9 +255,9 @@ GEM
mixlib-config (3.0.6)
tomlrb
mixlib-log (3.0.8)
- mixlib-shellout (3.1.2)
+ mixlib-shellout (3.1.1)
chef-utils
- mixlib-shellout (3.1.2-universal-mingw32)
+ mixlib-shellout (3.1.1-universal-mingw32)
chef-utils
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
@@ -458,6 +458,7 @@ DEPENDENCIES
fauxhai-ng
inspec-core (~> 4.18)
inspec-core-bin (~> 4.18)
+ mixlib-shellout (= 3.1.1)
ohai!
pry
pry-byebug