summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2013-07-16 12:03:04 -0700
committerSerdar Sutay <serdar@opscode.com>2013-07-16 12:03:04 -0700
commit1d28af2b42481a41cdd04f0f25e0f118ecee932f (patch)
treed8ac5f902a7372ca9dcad462e8bfba49775e31c6
parent064f22ecd7aacf8fccd8f1613ca4ed75e673dc9f (diff)
parent55da7f7c9cbab19ae4cb01e2590a23844ebd02d9 (diff)
downloadchef-1d28af2b42481a41cdd04f0f25e0f118ecee932f.tar.gz
Merge pull request #897 from opscode/active-support-fix
CHEF-4314: Pin active_support < 4.0.0 due to atomic + CAS issues
-rw-r--r--chef/Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/chef/Gemfile b/chef/Gemfile
index ba160b6586..192d10ca0e 100644
--- a/chef/Gemfile
+++ b/chef/Gemfile
@@ -3,7 +3,7 @@ source :rubygems
gemspec
gem "dep_selector", :group => :server, :platform => "ruby"
-gem "activesupport", :group => :compat_testing, :platform => "ruby"
+gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
group(:docgen) do
gem "ronn"