summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-04-09 09:01:16 -0700
committerTim Smith <tsmith@chef.io>2018-04-09 09:01:16 -0700
commitb15fb10bbb62b89d08a7651a9205b302a601bfc5 (patch)
tree23a92c73e248913502ba6db5f8f6c4f5e3757614
parentce0a8e7e0aa7e418e231762ed5ab4e47a4181e21 (diff)
downloadchef-bump_ohai.tar.gz
Bump dependencies to bring in Ohai 13.9bump_ohai
This has multiple fixes for Azure, Softlayer, and VM detection for macOS nodes Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock20
-rw-r--r--omnibus/Gemfile.lock35
2 files changed, 28 insertions, 27 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 098e3e84e6..2e67c6a2d9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -103,7 +103,7 @@ GEM
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
- byebug (10.0.0)
+ byebug (10.0.2)
chef-vault (3.3.0)
chef-zero (13.1.0)
ffi-yajl (~> 2.2)
@@ -121,14 +121,14 @@ GEM
safe_yaml (~> 1.0.0)
debug_inspector (0.0.3)
diff-lcs (1.3)
- docile (1.1.5)
- docker-api (1.34.1)
+ docile (1.3.0)
+ docker-api (1.34.2)
excon (>= 0.47.0)
multi_json
erubis (2.7.0)
ethon (0.11.0)
ffi (>= 1.3.0)
- excon (0.60.0)
+ excon (0.62.0)
faraday (0.14.0)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
@@ -218,7 +218,7 @@ GEM
nori (2.6.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (13.8.0)
+ ohai (13.9.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -231,7 +231,7 @@ GEM
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
parallel (1.12.1)
- parser (2.5.0.3)
+ parser (2.5.0.5)
ast (~> 2.4.0)
parslet (1.8.2)
plist (3.4.0)
@@ -255,7 +255,7 @@ GEM
rack (2.0.4)
rainbow (2.2.2)
rake
- rake (12.3.0)
+ rake (12.3.1)
rb-readline (0.5.5)
rspec (3.7.0)
rspec-core (~> 3.7.0)
@@ -299,13 +299,13 @@ GEM
rspec-its
specinfra (~> 2.72)
sfl (2.3)
- simplecov (0.15.1)
- docile (~> 1.1.0)
+ simplecov (0.16.1)
+ docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.73.2)
+ specinfra (2.73.3)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index b2f4e0e4a6..5ab4d71bc0 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,8 +1,8 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 9a3a97bb0c6b437524fdea15b4cd15a65ff6ac29
+ revision: 7f3652f85986ba24d681493bf2968326bfc2de46
specs:
- omnibus (5.6.10)
+ omnibus (5.6.11)
aws-sdk (~> 2)
chef-sugar (~> 3.3)
cleanroom (~> 1.0)
@@ -17,7 +17,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: f0c34cd3a21c4da6207721914213ac775b44570f
+ revision: 0cb3a8dfb6cebd56684c1d4609a676959389e4c5
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
@@ -29,13 +29,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.11.8)
- aws-sdk-resources (= 2.11.8)
- aws-sdk-core (2.11.8)
+ aws-sdk (2.11.31)
+ aws-sdk-resources (= 2.11.31)
+ aws-sdk-core (2.11.31)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.8)
- aws-sdk-core (= 2.11.8)
+ aws-sdk-resources (2.11.31)
+ aws-sdk-core (= 2.11.31)
aws-sigv4 (1.0.2)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -70,13 +70,13 @@ GEM
buff-shell_out (0.2.0)
buff-ruby_engine (~> 0.1.0)
builder (3.2.3)
- byebug (10.0.0)
+ byebug (10.0.2)
celluloid (0.16.0)
timers (~> 4.0.0)
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (13.8.0)
+ chef-config (14.0.190)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -106,7 +106,7 @@ GEM
httpclient (2.7.2)
iostruct (0.0.4)
ipaddress (0.8.3)
- jmespath (1.3.1)
+ jmespath (1.4.0)
json (2.1.0)
kitchen-vagrant (0.19.0)
test-kitchen (~> 1.4)
@@ -125,12 +125,13 @@ GEM
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
- mixlib-config (2.2.5)
+ mixlib-config (2.2.6)
+ tomlrb
mixlib-install (3.9.3)
mixlib-shellout
mixlib-versioning
thor
- mixlib-log (1.7.1)
+ mixlib-log (2.0.3)
mixlib-shellout (2.3.2)
mixlib-shellout (2.3.2-universal-mingw32)
win32-process (~> 0.8.2)
@@ -144,18 +145,18 @@ GEM
net-ssh (4.2.0)
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
- nio4r (2.2.0)
+ nio4r (2.3.0)
nori (2.6.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (13.8.0)
- chef-config (>= 12.5.0.alpha.1, < 14)
+ ohai (14.0.29)
+ chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
mixlib-cli
mixlib-config (~> 2.0)
- mixlib-log (>= 1.7.1, < 2.0)
+ mixlib-log (~> 2.0, >= 2.0.1)
mixlib-shellout (~> 2.0)
plist (~> 3.1)
systemu (~> 2.6.4)