diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-09 11:54:54 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-09 11:54:54 -0800 |
| commit | bf2532616e3ac9a66b0041565e487329e3ad2489 (patch) | |
| tree | ea7811d4d6f8bedd9a2ead85df95fdd25214b04e /activesupport/CHANGELOG | |
| parent | 781e29be0a18b6c0a4de42edef5e9157429a6686 (diff) | |
| parent | e54f17920fddebdfa241a5d9253ad5810972af87 (diff) | |
| download | rails-bf2532616e3ac9a66b0041565e487329e3ad2489.tar.gz rails-bf2532616e3ac9a66b0041565e487329e3ad2489.tar.bz2 rails-bf2532616e3ac9a66b0041565e487329e3ad2489.zip | |
Merge branch 'master' of git@github.com:rails/rails
Conflicts:
activesupport/CHANGELOG
Diffstat (limited to 'activesupport/CHANGELOG')
| -rw-r--r-- | activesupport/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index a74c645981..46081d11fb 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -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] |