aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/vendor.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-12-09 11:13:02 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-12-09 11:13:56 +0100
commite54f17920fddebdfa241a5d9253ad5810972af87 (patch)
tree9f59954743619e0478c359849905585d150e793e /activesupport/lib/active_support/vendor.rb
parent9adcf951ea7e5342c913dda40594cbb382995e3b (diff)
downloadrails-e54f17920fddebdfa241a5d9253ad5810972af87.tar.gz
rails-e54f17920fddebdfa241a5d9253ad5810972af87.tar.bz2
rails-e54f17920fddebdfa241a5d9253ad5810972af87.zip
Updated included memcache-client to the 1.5.0.5 version which includes fixes from fiveruns and 37signals to deal with failover and timeouts (Joshua Sierles) [#1535 state:committed]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
Diffstat (limited to 'activesupport/lib/active_support/vendor.rb')
-rw-r--r--activesupport/lib/active_support/vendor.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
index 463610722c..4525bba559 100644
--- a/activesupport/lib/active_support/vendor.rb
+++ b/activesupport/lib/active_support/vendor.rb
@@ -9,9 +9,9 @@ end
require 'builder'
begin
- gem 'memcache-client', '~> 1.5.1'
+ gem 'memcache-client', '~> 1.5.0.5'
rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.1"
+ $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.0.5"
end
begin