summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-08-11 11:20:38 -0700
committerGitHub <noreply@github.com>2020-08-11 11:20:38 -0700
commitc30636763f3ed49edae5b26cf83577fe0a3fa732 (patch)
treecafc2d795557db8c0676c4a407db6a7d9d191c17
parentd893c58194ae64b3615258b1fa13959d32d5f94c (diff)
parent86531d212944ae52e72625ef568e2cbf55e212d6 (diff)
downloadchef-c30636763f3ed49edae5b26cf83577fe0a3fa732.tar.gz
Merge pull request #10281 from chef/ohai_bump
Bump Ohai / Cheffish to the latest
-rw-r--r--Gemfile.lock22
-rw-r--r--omnibus/Gemfile.lock14
2 files changed, 17 insertions, 19 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d7d439957a..56d62033c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,17 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 605f02c66120e999c00895fe3d53769472759aa5
+ revision: 560b01fae7fea3e5ffc98deef9488838ea3780e2
branch: master
specs:
- chefstyle (1.2.0)
- rubocop (= 0.88.0)
+ chefstyle (1.2.1)
+ rubocop (= 0.89.1)
GIT
remote: https://github.com/chef/ohai.git
- revision: d3a85588a81c0384039d09376adfadc2977de74f
+ revision: b8173c1103eeb76d7de1a7871d649c395820c5c5
branch: master
specs:
- ohai (16.4.2)
+ ohai (16.4.8)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
@@ -22,7 +22,6 @@ GIT
mixlib-log (>= 2.0.1, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
plist (~> 3.1)
- systemu (~> 2.6.4)
wmi-lite (~> 1.0)
PATH
@@ -160,11 +159,11 @@ GEM
mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
- cheffish (16.0.2)
+ cheffish (16.0.6)
chef-zero (>= 14.0)
net-ssh
coderay (1.1.3)
- concurrent-ruby (1.1.6)
+ concurrent-ruby (1.1.7)
crack (0.4.3)
safe_yaml (~> 1.0.0)
debug_inspector (0.0.3)
@@ -322,13 +321,13 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (0.88.0)
+ rubocop (0.89.1)
parallel (~> 1.10)
parser (>= 2.7.1.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
- rubocop-ast (>= 0.1.0, < 1.0)
+ rubocop-ast (>= 0.3.0, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.3.0)
@@ -350,7 +349,6 @@ GEM
structured_warnings (0.4.0)
sync (0.5.0)
syslog-logger (1.6.8)
- systemu (2.6.5)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.0.1)
@@ -371,7 +369,7 @@ GEM
pastel (~> 0.7.2)
strings (~> 0.1.6)
tty-cursor (~> 0.7)
- tty-color (0.5.1)
+ tty-color (0.5.2)
tty-cursor (0.7.1)
tty-prompt (0.21.0)
necromancer (~> 0.5.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 4c79bd0cb1..49e9471d9a 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: ddae3723ac532c779f6db65be237dc9f73e968c4
+ revision: 348b519dac442f3caa1560896fb6264a37907d09
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.351.0)
+ aws-partitions (1.353.0)
aws-sdk-core (3.104.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -41,7 +41,7 @@ GEM
aws-sdk-kms (1.36.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.75.0)
+ aws-sdk-s3 (1.76.0)
aws-sdk-core (~> 3, >= 3.104.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -165,7 +165,7 @@ GEM
uuidtools (~> 2.1)
citrus (3.0.2)
cleanroom (1.0.0)
- concurrent-ruby (1.1.6)
+ concurrent-ruby (1.1.7)
diff-lcs (1.3)
ed25519 (1.2.4)
equatable (0.6.1)
@@ -196,7 +196,7 @@ GEM
iso8601 (0.13.0)
jmespath (1.4.0)
json (2.3.1)
- kitchen-vagrant (1.6.1)
+ kitchen-vagrant (1.7.0)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
license-acceptance (1.0.19)
@@ -204,7 +204,7 @@ GEM
tomlrb (~> 1.2)
tty-box (~> 0.3)
tty-prompt (~> 0.18)
- license_scout (1.1.8)
+ license_scout (1.1.9)
ffi-yajl (~> 2.2)
mixlib-shellout (>= 2.2, < 4.0)
toml-rb (>= 1, < 3)
@@ -328,7 +328,7 @@ GEM
pastel (~> 0.7.2)
strings (~> 0.1.6)
tty-cursor (~> 0.7)
- tty-color (0.5.1)
+ tty-color (0.5.2)
tty-cursor (0.7.1)
tty-prompt (0.21.0)
necromancer (~> 0.5.0)