diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-02-21 10:57:39 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-21 10:57:39 -0800 |
commit | 6ee0a7e10d478908170027f5b44787b7902ad7a4 (patch) | |
tree | 93885f66f4929d1a30dcd6fc79fa2f34def37e6e | |
parent | decccb25e766bc79c09006ea552d7137aa971133 (diff) | |
parent | f69d30eeb39ad00b0c70245dd1362cf11eb41495 (diff) | |
download | chef-6ee0a7e10d478908170027f5b44787b7902ad7a4.tar.gz |
Merge pull request #8244 from chef/lcg/libsodium
pin rbnacl to 5.x
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 7 insertions, 7 deletions
@@ -51,7 +51,7 @@ end group(:ed25519) do gem "rbnacl-libsodium" - gem "rbnacl" + gem "rbnacl", "~> 5.0" # pin to 5.x until we can replace rbnacl-libsodium gem "bcrypt_pbkdf" end diff --git a/Gemfile.lock b/Gemfile.lock index 8099313ee2..fc1ecf6285 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,14 +119,14 @@ GEM mixlib-cli (~> 1.4) mixlib-shellout (~> 2.0) ast (2.4.0) - backports (3.11.4) + backports (3.12.0) bcrypt_pbkdf (1.0.0) bcrypt_pbkdf (1.0.0-x64-mingw32) bcrypt_pbkdf (1.0.0-x86-mingw32) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (10.0.2) + byebug (11.0.0) chef-vault (3.4.3) chef-zero (14.0.11) ffi-yajl (~> 2.2) @@ -246,8 +246,8 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) pry-remote (0.1.8) pry (~> 0.9) @@ -262,7 +262,7 @@ GEM rainbow (3.0.0) rake (12.3.0) rb-readline (0.5.5) - rbnacl (6.0.1) + rbnacl (5.0.0) ffi rbnacl-libsodium (1.0.16) rbnacl (>= 3.0.1) @@ -425,7 +425,7 @@ DEPENDENCIES pry-stack_explorer rake (<= 12.3.0) rb-readline - rbnacl + rbnacl (~> 5.0) rbnacl-libsodium ruby-prof ruby-shadow |