summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-06-14 11:36:58 -0700
committerGitHub <noreply@github.com>2019-06-14 11:36:58 -0700
commit977f8a0c3e2b6e7d701ce949a67ddd08f698095a (patch)
treeb5617cae3b040545529af8025108cffc078ce5d8
parentb5f43ecedcb94a09bf3496563299db5363708887 (diff)
parent9222325bbae6ca2e62afd5eaaa4a435b85b51683 (diff)
downloadchef-977f8a0c3e2b6e7d701ce949a67ddd08f698095a.tar.gz
Merge pull request #8661 from chef/bumps
Update Ohai to 15.1.3 and license-acceptance to 1.0.13
-rw-r--r--Gemfile.lock16
-rw-r--r--omnibus/Gemfile.lock168
2 files changed, 80 insertions, 104 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a6524f311c..ba8648918c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: f04de72cd0a1b8636ca60c238930c4ed60187516
+ revision: d1a25fa525a4760609642d244cc729a46aa194ce
branch: master
specs:
- ohai (15.0.39)
+ ohai (15.1.3)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -147,7 +147,7 @@ GEM
safe_yaml (~> 1.0.0)
debug_inspector (0.0.3)
diff-lcs (1.3)
- docile (1.3.1)
+ docile (1.3.2)
ed25519 (1.2.4)
equatable (0.5.0)
erubis (2.7.0)
@@ -207,7 +207,7 @@ GEM
jaro_winkler (1.5.2)
json (2.2.0)
libyajl2 (1.2.0)
- license-acceptance (1.0.12)
+ license-acceptance (1.0.13)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
@@ -275,18 +275,18 @@ GEM
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
- rspec-core (3.8.0)
+ rspec-core (3.8.1)
rspec-support (~> 3.8.0)
- rspec-expectations (3.8.3)
+ rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
- rspec-mocks (3.8.0)
+ rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
- rspec-support (3.8.0)
+ rspec-support (3.8.2)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 991d779761..f609644be8 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 968307c129ee54416f5a4d07ca8f8ca2d2b12825
+ revision: 035cc8392be8906b4c13e7dd2048d9c659fd034e
branch: master
specs:
- omnibus (6.0.27)
+ omnibus (6.0.30)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 02869232bd219e8018f7d16b222a6af7403f0ad8
+ revision: 5cf947c96ffb97b0771df43c18190dbedac7f3a1
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,19 +32,19 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.161.0)
- aws-sdk-core (3.51.0)
+ aws-partitions (1.174.0)
+ aws-sdk-core (3.54.2)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.18.0)
- aws-sdk-core (~> 3, >= 3.48.2)
+ aws-sdk-kms (1.21.0)
+ aws-sdk-core (~> 3, >= 3.53.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.36.1)
- aws-sdk-core (~> 3, >= 3.48.2)
+ aws-sdk-s3 (1.42.0)
+ aws-sdk-core (~> 3, >= 3.53.0)
aws-sdk-kms (~> 1)
- aws-sigv4 (~> 1.0)
+ aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt_pbkdf (1.0.1)
@@ -64,66 +64,66 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.3)
- chef (14.12.9)
+ chef (15.0.300)
addressable
+ bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 14.12.9)
- chef-zero (>= 13.0)
+ chef-config (= 15.0.300)
+ chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
+ ed25519 (~> 1.2)
erubis (~> 2.7)
ffi (~> 1.9, >= 1.9.25)
+ ffi-libarchive
ffi-yajl (~> 2.2)
- highline (~> 1.6, >= 1.6.9)
+ highline (>= 1.6.9, < 2)
iniparse (~> 1.4)
+ license-acceptance (~> 1.0, >= 1.0.5)
mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (~> 2.1)
mixlib-cli (>= 1.7, < 3.0)
mixlib-log (>= 2.0.3, < 4.0)
mixlib-shellout (>= 2.4, < 4.0)
net-sftp (~> 2.1, >= 2.1.2)
- net-ssh (~> 4.2)
+ net-ssh (>= 4.2, < 6)
net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (~> 14.0)
+ ohai (~> 15.0)
plist (~> 3.2)
proxifier (~> 1.0)
- rspec-core (~> 3.5)
- rspec-expectations (~> 3.5)
- rspec-mocks (~> 3.5)
- rspec_junit_formatter (~> 0.2.0)
- serverspec (~> 2.7)
- specinfra (~> 2.10)
syslog-logger (~> 1.6)
+ train-core (~> 2.0, >= 2.0.12)
+ tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (14.12.9-universal-mingw32)
+ chef (15.0.300-universal-mingw32)
addressable
+ bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 14.12.9)
- chef-zero (>= 13.0)
+ chef-config (= 15.0.300)
+ chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
+ ed25519 (~> 1.2)
erubis (~> 2.7)
ffi (~> 1.9, >= 1.9.25)
+ ffi-libarchive
ffi-yajl (~> 2.2)
- highline (~> 1.6, >= 1.6.9)
+ highline (>= 1.6.9, < 2)
iniparse (~> 1.4)
iso8601 (~> 0.12.1)
+ license-acceptance (~> 1.0, >= 1.0.5)
mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (~> 2.1)
mixlib-cli (>= 1.7, < 3.0)
mixlib-log (>= 2.0.3, < 4.0)
mixlib-shellout (>= 2.4, < 4.0)
net-sftp (~> 2.1, >= 2.1.2)
- net-ssh (~> 4.2)
+ net-ssh (>= 4.2, < 6)
net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (~> 14.0)
+ ohai (~> 15.0)
plist (~> 3.2)
proxifier (~> 1.0)
- rspec-core (~> 3.5)
- rspec-expectations (~> 3.5)
- rspec-mocks (~> 3.5)
- rspec_junit_formatter (~> 0.2.0)
- serverspec (~> 2.7)
- specinfra (~> 2.10)
syslog-logger (~> 1.6)
+ train-core (~> 2.0, >= 2.0.12)
+ tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
win32-api (~> 1.5.3)
win32-certstore (~> 0.3)
@@ -133,10 +133,10 @@ GEM
win32-mmap (~> 0.4.1)
win32-mutex (~> 0.4.2)
win32-process (~> 0.8.2)
- win32-service (>= 1.0, < 3.0)
+ win32-service (>= 2.1.2, < 3.0)
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
- chef-config (14.12.9)
+ chef-config (15.0.300)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -158,9 +158,11 @@ GEM
erubis (2.7.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
- ffi (1.10.0)
- ffi (1.10.0-x64-mingw32)
- ffi (1.10.0-x86-mingw32)
+ ffi (1.11.1)
+ ffi (1.11.1-x64-mingw32)
+ ffi (1.11.1-x86-mingw32)
+ ffi-libarchive (0.4.6)
+ ffi (~> 1.0)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.1)
@@ -178,10 +180,11 @@ GEM
ipaddress (0.8.3)
iso8601 (0.12.1)
jmespath (1.4.0)
+ json (2.2.0)
kitchen-vagrant (1.5.2)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
- license-acceptance (1.0.5)
+ license-acceptance (1.0.13)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
@@ -200,7 +203,7 @@ GEM
mixlib-archive (1.0.1-universal-mingw32)
mixlib-log
mixlib-authentication (2.1.1)
- mixlib-cli (2.0.3)
+ mixlib-cli (2.1.1)
mixlib-config (3.0.1)
tomlrb
mixlib-install (3.11.18)
@@ -216,23 +219,22 @@ GEM
molinillo (0.6.6)
multi_json (1.13.1)
multipart-post (2.0.0)
- necromancer (0.4.0)
+ necromancer (0.5.0)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (4.2.0)
+ net-ssh (5.2.0)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
net-ssh-multi (1.2.1)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
- net-telnet (0.1.1)
nori (2.6.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (14.8.12)
- chef-config (>= 12.8, < 15)
+ ohai (15.0.35)
+ chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
@@ -253,51 +255,21 @@ GEM
progressbar
zhexdump (>= 0.0.2)
plist (3.5.0)
- progressbar (1.10.0)
+ progressbar (1.10.1)
proxifier (1.0.3)
- public_suffix (3.0.3)
+ public_suffix (3.1.0)
rack (2.0.7)
retryable (3.0.4)
- rspec (3.8.0)
- rspec-core (~> 3.8.0)
- rspec-expectations (~> 3.8.0)
- rspec-mocks (~> 3.8.0)
- rspec-core (3.8.0)
- rspec-support (~> 3.8.0)
- rspec-expectations (3.8.3)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.8.0)
- rspec-its (1.3.0)
- rspec-core (>= 3.0.0)
- rspec-expectations (>= 3.0.0)
- rspec-mocks (3.8.0)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.8.0)
- rspec-support (3.8.0)
- rspec_junit_formatter (0.2.3)
- builder (< 4)
- rspec-core (>= 2, < 4, != 2.12.0)
- ruby-progressbar (1.10.0)
+ ruby-progressbar (1.10.1)
rubyntlm (0.6.2)
- rubyzip (1.2.2)
+ rubyzip (1.2.3)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
semverse (3.0.0)
- serverspec (2.41.3)
- multi_json
- rspec (~> 3.0)
- rspec-its
- specinfra (~> 2.72)
- sfl (2.3)
solve (4.0.2)
molinillo (~> 0.6)
semverse (>= 1.1, < 4.0)
- specinfra (2.77.1)
- net-scp
- net-ssh (>= 2.7)
- net-telnet (= 0.1.1)
- sfl
strings (0.1.5)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
@@ -306,10 +278,10 @@ GEM
structured_warnings (0.3.0)
syslog-logger (1.6.8)
systemu (2.6.5)
- test-kitchen (2.2.3)
+ test-kitchen (2.2.5)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
- license-acceptance (~> 1.0, >= 1.0.5)
+ license-acceptance (~> 1.0, >= 1.0.11)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (>= 1.1, < 3.0)
@@ -320,27 +292,31 @@ GEM
winrm-elevated (~> 1.0)
winrm-fs (~> 1.1)
thor (0.20.3)
- timers (4.3.0)
toml-rb (1.1.2)
citrus (~> 3.0, > 3.0)
tomlrb (1.2.8)
- tty-box (0.3.0)
+ train-core (2.1.7)
+ json (>= 1.8, < 3.0)
+ mixlib-shellout (>= 2.0, < 4.0)
+ net-scp (>= 1.2, < 3.0)
+ net-ssh (>= 2.9, < 6.0)
+ winrm (~> 2.0)
+ winrm-fs (~> 1.0)
+ tty-box (0.4.0)
pastel (~> 0.7.2)
- strings (~> 0.1.4)
- tty-cursor (~> 0.6.0)
+ strings (~> 0.1.5)
+ tty-cursor (~> 0.7)
tty-color (0.4.3)
- tty-cursor (0.6.1)
- tty-prompt (0.18.1)
- necromancer (~> 0.4.0)
+ tty-cursor (0.7.0)
+ tty-prompt (0.19.0)
+ necromancer (~> 0.5.0)
pastel (~> 0.7.0)
- timers (~> 4.0)
- tty-cursor (~> 0.6.0)
- tty-reader (~> 0.5.0)
- tty-reader (0.5.0)
- tty-cursor (~> 0.6.0)
- tty-screen (~> 0.6.4)
+ tty-reader (~> 0.6.0)
+ tty-reader (0.6.0)
+ tty-cursor (~> 0.7)
+ tty-screen (~> 0.7)
wisper (~> 2.0.0)
- tty-screen (0.6.5)
+ tty-screen (0.7.0)
unicode-display_width (1.6.0)
unicode_utils (1.4.0)
uuidtools (2.1.5)