summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-04-25 14:01:51 -0700
committerMatt Wrock <matt@mattwrock.com>2016-04-25 14:01:51 -0700
commitc05e43b0d7a1b594843fda9296bd494b302fd184 (patch)
tree7e4a7ec9e736e13eb355c0aad2878776b0da150d /Gemfile.lock
parent7edd6a4aec64ea23fc01cd711a537aab4b6eaad7 (diff)
parentde243172e1b47afbc0873769d637caf7d4199114 (diff)
downloadchef-c05e43b0d7a1b594843fda9296bd494b302fd184.tar.gz
Merge pull request #4841 from chef/fipfop
Run in fips mode if node is fips enabled
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 9833cb3ee1..8987ff0681 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,7 +33,7 @@ PATH
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 4.0)
net-ssh-multi (~> 1.1)
- ohai (>= 8.6.0.alpha.1, < 9)
+ ohai (~> 8.15)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.4)
@@ -60,7 +60,7 @@ PATH
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 4.0)
net-ssh-multi (~> 1.1)
- ohai (>= 8.6.0.alpha.1, < 9)
+ ohai (~> 8.15)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.4)