diff options
| author | Tim Smith <tsmith@chef.io> | 2021-06-21 15:22:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 15:22:33 -0700 |
| commit | 0124bb7e7b2f482f09548ad274f0341ab94190f1 (patch) | |
| tree | 1f4015989de834109f27d3653d2c852183e8bcd9 | |
| parent | 59475598db562e6fb7d4ffe48f3f354355ae6fe7 (diff) | |
| parent | b831b5be3760fd51e8316456ff3164f75e83d7d0 (diff) | |
| download | chef-0124bb7e7b2f482f09548ad274f0341ab94190f1.tar.gz | |
Merge pull request #11728 from chef/expeditor/chef/chefstyle_2d48272d6c855ac7453ecdce473bd4c686b5d669
Bump chef/chefstyle to latest and ffi to 1.15.3
| -rw-r--r-- | Gemfile.lock | 16 | ||||
| -rw-r--r-- | knife/knife.gemspec | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 014ccd9dc5..6ebc763a90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: b257fe452318540c7016066beb845e0706917cb4 + revision: 507e9f69d57b99da1d5adc64e668cf19d31f1f2d branch: master specs: - chefstyle (2.0.4) - rubocop (= 1.15.0) + chefstyle (2.0.5) + rubocop (= 1.17.0) GIT remote: https://github.com/chef/ohai.git @@ -176,9 +176,9 @@ GEM faraday (~> 1.0) fauxhai-ng (9.0.0) net-ssh - ffi (1.15.1) - ffi (1.15.1-x64-mingw32) - ffi (1.15.1-x86-mingw32) + ffi (1.15.3) + ffi (1.15.3-x64-mingw32) + ffi (1.15.3-x86-mingw32) ffi-libarchive (1.0.17) ffi (~> 1.0) ffi-win32-extensions (1.0.4) @@ -294,13 +294,13 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) - rubocop (1.15.0) + rubocop (1.17.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.5.0, < 2.0) + rubocop-ast (>= 1.7.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.7.0) diff --git a/knife/knife.gemspec b/knife/knife.gemspec index a0e4b42c97..6684c2f3bf 100644 --- a/knife/knife.gemspec +++ b/knife/knife.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |s| s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support s.add_dependency "bcrypt_pbkdf", "~> 1.1" # ed25519 ssh key support # we can't use this gem until illegal instruction issues are resolved - #s.add_dependency "x25519" # ed25519 KEX module + # s.add_dependency "x25519" # ed25519 KEX module s.add_dependency "highline", ">= 1.6.9", "< 3" # Used in UI to present a list, no other usage. s.add_dependency "tty-prompt", "~> 0.21" # knife ui.ask prompt |