Permalink
Browse files

Merge branch 'master' of git@github.com:rails/rails

Conflicts:
	activesupport/CHANGELOG
  • Loading branch information...
2 parents 781e29b + e54f179 commit bf2532616e3ac9a66b0041565e487329e3ad2489 @jeremy jeremy committed Dec 9, 2008
View
@@ -2,6 +2,8 @@
* Add Benchmark.ms convenience method to benchmark realtime in milliseconds. [Jeremy Kemper]
+* Updated included memcache-client to the 1.5.0.5 version which includes fixes from fiveruns and 37signals to deal with failover and timeouts #1535 [Joshua Sierles]
+
* Multibyte: add multibyte-safe Chars#ord rather than falling back to String#ord. #1483 [Jason Cheow]
* I18n support for Array#to_sentence. Introduces support.array.words_connector, .two_words_connector, and .last_word_connector translation keys. #1397 [Akira Matsuda]
@@ -9,9 +9,9 @@
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
Oops, something went wrong.

0 comments on commit bf25326

Please sign in to comment.