summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-01-27 14:20:23 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-02-09 09:16:06 -0800
commitd62f39064dcbfdd0c86619f3d2fb1a7f0f9570b9 (patch)
tree3d027eb20423657608f99a49604e9cf8743dbb14
parent294e3130eaa9093d5c7084fa3b86e7f298d1aa52 (diff)
downloadchef-d62f39064dcbfdd0c86619f3d2fb1a7f0f9570b9.tar.gz
set the floor to when bundler/inline was released
-rw-r--r--chef.gemspec5
1 files changed, 3 insertions, 2 deletions
diff --git a/chef.gemspec b/chef.gemspec
index 9adbf0c1b5..1f4675ea8b 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -45,8 +45,9 @@ Gem::Specification.new do |s|
s.add_dependency "proxifier", "~> 1.0"
- # needed for 'bundler/inline', very deliberately not pinning this at all to avoid conflicts
- s.add_depeenency "bundler"
+ # 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_depeenency "bundler", ">= 1.10"
s.add_development_dependency "rack"
s.add_development_dependency "cheffish", ">= 1.1", "< 3.0"