diff options
| author | Tim Smith <tsmith@chef.io> | 2020-11-05 00:37:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 00:37:10 -0800 |
| commit | a57130ec2ef86825c6eaed8927dff87788219220 (patch) | |
| tree | 7eadb0e8686d78d9c7ad9eca96f86727d237bed1 | |
| parent | 4dd25f881a9d8eae7b82377de084836858d8e57b (diff) | |
| parent | 6d61bc0c793f060f40c59d92b61becfdc3013111 (diff) | |
| download | chef-a57130ec2ef86825c6eaed8927dff87788219220.tar.gz | |
Merge pull request #10602 from chef/bumps
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 8 |
3 files changed, 7 insertions, 11 deletions
@@ -30,8 +30,6 @@ group(:omnibus_package) do gem "inspec-core", "~> 4.18" gem "inspec-core-bin", "~> 4.18" # need to provide the binaries for inspec gem "chef-vault" - gem "ed25519" # ed25519 ssh key support done here as it's a native gem we can't put in train - gem "bcrypt_pbkdf", ">= 1.1.0.rc1" # ed25519 ssh key support done here as it's a native gem we can't put in train end group(:omnibus_package, :pry) do diff --git a/Gemfile.lock b/Gemfile.lock index feabc9a77b..4996ca8353 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: 7557513c626fb4f2372a09074e1411b5fc8de64f + revision: 0a2584c4ef7120031d97beb3b05e833ec4cb5857 branch: master specs: - ohai (16.7.9) + ohai (16.7.13) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) @@ -322,7 +322,7 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.1.0) + rubocop-ast (1.1.1) parser (>= 2.7.1.5) ruby-prof (1.2.0) ruby-progressbar (1.10.1) @@ -428,7 +428,6 @@ PLATFORMS DEPENDENCIES appbundler - bcrypt_pbkdf (>= 1.1.0.rc1) chef! chef-bin! chef-config! @@ -437,7 +436,6 @@ DEPENDENCIES chef-vault cheffish (>= 14) chefstyle! - ed25519 fauxhai-ng inspec-core (~> 4.18) inspec-core-bin (~> 4.18) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 7f448f98d7..6477ffbf38 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -32,8 +32,8 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.388.0) - aws-sdk-core (3.109.1) + aws-partitions (1.389.0) + aws-sdk-core (3.109.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -197,7 +197,7 @@ GEM iso8601 (0.13.0) jmespath (1.4.0) json (2.3.1) - kitchen-vagrant (1.7.0) + kitchen-vagrant (1.7.1) test-kitchen (>= 1.4, < 3) libyajl2 (1.2.0) license-acceptance (2.1.2) @@ -222,7 +222,7 @@ GEM mixlib-cli (2.1.8) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.3) + mixlib-install (3.12.5) mixlib-shellout mixlib-versioning thor |