diff options
| author | Tim Smith <tsmith@chef.io> | 2020-04-27 11:25:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 11:25:00 -0700 |
| commit | 83a99eac530983d2933792579f6873da20b7a262 (patch) | |
| tree | f67875222f63cff5e5915def7f8440384aa3bd11 | |
| parent | a1a4b61b84620b9f1771886bf9fa43a9ca1e935d (diff) | |
| parent | 58e0958595bb7f673c442dd925961aa144dff6c0 (diff) | |
| download | chef-83a99eac530983d2933792579f6873da20b7a262.tar.gz | |
Merge pull request #9749 from chef/mp/CHEF-9639
Update bcrypt_pbkdf to 1.1.0.rc1
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -29,7 +29,7 @@ group(:omnibus_package) do 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" # 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 6a98d3de46..e2ba4c472a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,9 +139,9 @@ GEM mixlib-cli (>= 1.4, < 3.0) mixlib-shellout (>= 2.0, < 4.0) ast (2.4.0) - bcrypt_pbkdf (1.0.1) - bcrypt_pbkdf (1.0.1-x64-mingw32) - bcrypt_pbkdf (1.0.1-x86-mingw32) + bcrypt_pbkdf (1.1.0.rc1) + bcrypt_pbkdf (1.1.0.rc1-x64-mingw32) + bcrypt_pbkdf (1.1.0.rc1-x86-mingw32) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.4) @@ -454,7 +454,7 @@ PLATFORMS DEPENDENCIES appbundler - bcrypt_pbkdf + bcrypt_pbkdf (>= 1.1.0.rc1) chef! chef-bin! chef-config! |