summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2012-12-24 13:02:55 -0800
committerBryan McLellan <btm@opscode.com>2012-12-24 13:02:55 -0800
commit8d7927b05508267e84f027c2712561d0ef2cefb0 (patch)
treea913b3cf7524f3b10668dcb74587125d49e4bcef
parenteb5e9f1eaeed10f8fbef819604095098521b40e2 (diff)
parent2dab51f2eca4a50eb72872becb00e37a7ba8f7b9 (diff)
downloadchef-8d7927b05508267e84f027c2712561d0ef2cefb0.tar.gz
Merge branch '10.16.4-release' into 10-stable
-rw-r--r--chef/chef.gemspec3
1 files changed, 2 insertions, 1 deletions
diff --git a/chef/chef.gemspec b/chef/chef.gemspec
index fc1820811d..124c13e208 100644
--- a/chef/chef.gemspec
+++ b/chef/chef.gemspec
@@ -28,7 +28,8 @@ Gem::Specification.new do |s|
s.add_dependency "net-ssh-multi", "~> 1.1.0"
# CHEF-3027: The knife-cloud plugins require newer features from highline, core chef should not.
s.add_dependency "highline", ">= 1.6.9"
- %w{erubis moneta uuidtools}.each { |gem| s.add_dependency gem }
+ s.add_dependency "moneta", "< 0.7.0"
+ %w{erubis uuidtools}.each { |gem| s.add_dependency gem }
# development_dependency thin: eventmachine 0.12.10 doesn't support Ruby 1.9 on Windows
%w(rdoc sdoc ronn rake rack rspec_junit_formatter).each { |gem| s.add_development_dependency gem }