diff options
| author | Tim Smith <tsmith@chef.io> | 2020-12-30 19:23:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 19:23:23 -0800 |
| commit | dcf7802efbb5c3ba73bd8050722b48bcc957ffd0 (patch) | |
| tree | 6561a8393a7c406db0edeabd493bd62fb0833f9d | |
| parent | aed9f8ab89e210cceebf872fb3b1824a24d2e79c (diff) | |
| parent | 27a5d23d7746a0f69827555ea6b12b3b755110b3 (diff) | |
| download | chef-dcf7802efbb5c3ba73bd8050722b48bcc957ffd0.tar.gz | |
Merge pull request #10801 from chef/bundler
Remove the runtime dep on bundler
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | chef.gemspec | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fc04dcfae1..b58e3c38c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,7 +31,6 @@ PATH chef (17.0.17) addressable bcrypt_pbkdf (= 1.1.0.rc1) - bundler (>= 1.10) chef-config (= 17.0.17) chef-utils (= 17.0.17) chef-vault @@ -68,7 +67,6 @@ PATH chef (17.0.17-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) - bundler (>= 1.10) chef-config (= 17.0.17) chef-utils (= 17.0.17) chef-vault diff --git a/chef.gemspec b/chef.gemspec index a41dffa741..b1408709ab 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -55,10 +55,6 @@ Gem::Specification.new do |s| s.add_dependency "proxifier", "~> 1.0" - # v1.10 is needed as a runtime dep now for 'bundler/inline' - # very deliberately avoiding putting a ceiling on this to avoid depsolver conflicts. - s.add_dependency "bundler", ">= 1.10" - s.bindir = "bin" s.executables = %w{ knife } |