diff options
| author | Tim Smith <tsmith@chef.io> | 2020-06-05 10:15:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 10:15:11 -0700 |
| commit | a83a20d9f8cde101101a237580cb96d67782d17b (patch) | |
| tree | 6c342cc42b2fb13e7acb34cbfa546ef8aaf5cc23 | |
| parent | 9f2282bcfa1fcf44e44c24ba92fcd6aef79d1e80 (diff) | |
| parent | d7bf9e1c5c0a9d162a5a44d7e441588d64578eb3 (diff) | |
| download | chef-a83a20d9f8cde101101a237580cb96d67782d17b.tar.gz | |
Merge pull request #9959 from chef/bumps
Update train-core to the latest
| -rw-r--r-- | Gemfile.lock | 9 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 13 |
2 files changed, 12 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b2178ded6c..48447a9eb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,8 +260,8 @@ GEM multi_json (1.14.1) multipart-post (2.1.1) necromancer (0.5.1) - net-scp (2.0.0) - net-ssh (>= 2.6.5, < 6.0.0) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) net-sftp (2.1.2) net-ssh (>= 2.6.5) net-ssh (5.2.0) @@ -353,11 +353,12 @@ GEM tins (1.25.0) sync tomlrb (1.3.0) - train-core (3.2.28) + train-core (3.2.37) addressable (~> 2.5) + ffi (< 1.13) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 3.0) + net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 6.0) train-winrm (0.2.6) winrm (~> 2.0) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 4112336d0e..d7a83eeafa 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus - revision: 61139fb5a5b1a0a9a212d1e1efc1f88776d0479a + revision: 656496eaefadc4e5676eae5ad722acd6f8c22b2a branch: master specs: omnibus (7.0.12) @@ -33,7 +33,7 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.324.0) + aws-partitions (1.325.0) aws-sdk-core (3.97.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -234,8 +234,8 @@ GEM multi_json (1.14.1) multipart-post (2.1.1) necromancer (0.5.1) - net-scp (2.0.0) - net-ssh (>= 2.6.5, < 6.0.0) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) net-sftp (2.1.2) net-ssh (>= 2.6.5) net-ssh (5.2.0) @@ -313,11 +313,12 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.2.28) + train-core (3.2.37) addressable (~> 2.5) + ffi (< 1.13) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 3.0) + net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 6.0) train-winrm (0.2.6) winrm (~> 2.0) |