summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-09-30 13:57:36 -0700
committerTim Smith <tsmith84@gmail.com>2020-09-30 13:57:36 -0700
commit727466570ef88bd65035d7611310d5c1b1246750 (patch)
tree7cb6ac8fa5fddf2acb2898434c1a35770b782a62
parent24fefa2df8b409b270de87aa5efa40049e720718 (diff)
downloadchef-727466570ef88bd65035d7611310d5c1b1246750.tar.gz
Pull in Ohai 16.6 and train-core/train-winrm updates
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock19
-rw-r--r--omnibus/Gemfile.lock85
2 files changed, 52 insertions, 52 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index dd2e50c5b1..9a48811751 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,17 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 7e828c793e50bb955389fc8064a2562727d82912
+ revision: fb934be0cce05bdb30e6329e109cdb614333406b
branch: master
specs:
- chefstyle (1.4.2)
+ chefstyle (1.4.3)
rubocop (= 0.92.0)
GIT
remote: https://github.com/chef/ohai.git
- revision: e0d81b68c3b78712e0c34ce14ff60d7dcc662d25
+ revision: 6d6e6f4cd6218d2e4285897cbda1cf9c11c094a9
branch: master
specs:
- ohai (16.5.6)
+ ohai (16.6.0)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
@@ -300,7 +300,7 @@ GEM
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
- rspec-core (3.9.2)
+ rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
@@ -343,15 +343,16 @@ GEM
syslog-logger (1.6.8)
thor (1.0.1)
tomlrb (1.2.9)
- train-core (3.3.21)
+ train-core (3.3.24)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 4.0)
net-ssh (>= 2.9, < 7.0)
- train-winrm (0.2.6)
+ train-winrm (0.2.11)
winrm (~> 2.0)
+ winrm-elevated (~> 1.2.2)
winrm-fs (~> 1.0)
tty-box (0.6.0)
pastel (~> 0.8)
@@ -410,6 +411,10 @@ GEM
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0, >= 0.6.1)
+ winrm-elevated (1.2.2)
+ erubi (~> 1.8)
+ winrm (~> 2.0)
+ winrm-fs (~> 1.0)
winrm-fs (1.3.3)
erubi (~> 1.8)
logging (>= 1.6.1, < 3.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 30eca638df..5c7364b84b 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 0f9a7a996f9bb783d7f6faac05959c2d9a295b03
+ revision: 3e43293a0eff95c4175c983247b737a2ce137e35
branch: master
specs:
- omnibus (7.0.25)
+ omnibus (7.0.27)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
@@ -32,14 +32,14 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.376.0)
- aws-sdk-core (3.108.0)
+ aws-partitions (1.378.0)
+ aws-sdk-core (3.109.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.38.0)
- aws-sdk-core (~> 3, >= 3.99.0)
+ aws-sdk-kms (1.39.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.81.1)
aws-sdk-core (~> 3, >= 3.104.3)
@@ -64,12 +64,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (16.5.64)
+ chef (16.5.77)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.5.64)
- chef-utils (= 16.5.64)
+ chef-config (= 16.5.77)
+ chef-utils (= 16.5.77)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -98,14 +98,14 @@ GEM
train-winrm (>= 0.2.5)
tty-prompt (~> 0.21)
tty-screen (~> 0.6)
- tty-table (~> 0.11.0)
+ tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.5.64-universal-mingw32)
+ chef (16.5.77-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.5.64)
- chef-utils (= 16.5.64)
+ chef-config (= 16.5.77)
+ chef-utils (= 16.5.77)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -135,7 +135,7 @@ GEM
train-winrm (>= 0.2.5)
tty-prompt (~> 0.21)
tty-screen (~> 0.6)
- tty-table (~> 0.11.0)
+ tty-table (~> 0.11)
uuidtools (~> 2.1.5)
win32-api (~> 1.5.3)
win32-certstore (~> 0.3)
@@ -148,15 +148,15 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
- chef-config (16.5.64)
+ chef-config (16.5.77)
addressable
- chef-utils (= 16.5.64)
+ chef-utils (= 16.5.77)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar (5.1.11)
- chef-utils (16.5.64)
+ chef-utils (16.5.77)
chef-vault (4.0.12)
chef-zero (15.0.3)
ffi-yajl (~> 2.2)
@@ -169,7 +169,6 @@ GEM
concurrent-ruby (1.1.7)
diff-lcs (1.3)
ed25519 (1.2.4)
- equatable (0.6.1)
erubi (1.9.0)
erubis (2.7.0)
faraday (1.0.1)
@@ -200,11 +199,11 @@ GEM
kitchen-vagrant (1.7.0)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
- license-acceptance (1.0.19)
+ license-acceptance (2.1.2)
pastel (~> 0.7)
tomlrb (~> 1.2)
- tty-box (~> 0.3)
- tty-prompt (~> 0.18)
+ tty-box (~> 0.6)
+ tty-prompt (~> 0.20)
license_scout (1.1.11)
ffi-yajl (~> 2.2)
mixlib-shellout (>= 2.2, < 4.0)
@@ -237,7 +236,6 @@ GEM
molinillo (0.6.6)
multi_json (1.15.0)
multipart-post (2.1.1)
- necromancer (0.5.1)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-sftp (3.0.0)
@@ -264,8 +262,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
plist (~> 3.1)
wmi-lite (~> 1.0)
- pastel (0.7.4)
- equatable (~> 0.6)
+ pastel (0.8.0)
tty-color (~> 0.5)
pedump (0.6.1)
awesome_print
@@ -289,14 +286,14 @@ GEM
solve (4.0.4)
molinillo (~> 0.6)
semverse (>= 1.1, < 4.0)
- strings (0.1.8)
- strings-ansi (~> 0.1)
+ strings (0.2.0)
+ strings-ansi (~> 0.2)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
- test-kitchen (2.7.1)
+ test-kitchen (2.7.2)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (>= 1.0.11, < 3.0)
@@ -313,37 +310,35 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
- train-core (3.3.21)
+ train-core (3.3.24)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 4.0)
net-ssh (>= 2.9, < 7.0)
- train-winrm (0.2.6)
+ train-winrm (0.2.11)
winrm (~> 2.0)
+ winrm-elevated (~> 1.2.2)
winrm-fs (~> 1.0)
- tty-box (0.5.0)
- pastel (~> 0.7.2)
- strings (~> 0.1.6)
+ tty-box (0.6.0)
+ pastel (~> 0.8)
+ strings (~> 0.2.0)
tty-cursor (~> 0.7)
tty-color (0.5.2)
tty-cursor (0.7.1)
- tty-prompt (0.21.0)
- necromancer (~> 0.5.0)
- pastel (~> 0.7.0)
- tty-reader (~> 0.7.0)
- tty-reader (0.7.0)
+ tty-prompt (0.22.0)
+ pastel (~> 0.8)
+ tty-reader (~> 0.8)
+ tty-reader (0.8.0)
tty-cursor (~> 0.7)
- tty-screen (~> 0.7)
- wisper (~> 2.0.0)
+ tty-screen (~> 0.8)
+ wisper (~> 2.0)
tty-screen (0.8.1)
- tty-table (0.11.0)
- equatable (~> 0.6)
- necromancer (~> 0.5)
- pastel (~> 0.7.2)
- strings (~> 0.1.5)
- tty-screen (~> 0.7)
+ tty-table (0.12.0)
+ pastel (~> 0.8)
+ strings (~> 0.2.0)
+ tty-screen (~> 0.8)
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.1.5)