diff options
author | Aditya Sanghi <asanghi@me.com> | 2010-11-29 21:36:43 +0530 |
---|---|---|
committer | Aditya Sanghi <asanghi@me.com> | 2010-11-29 21:36:43 +0530 |
commit | 8601f163a8017950a4693855ebaa9141d443e277 (patch) | |
tree | e722d99c714295e23cbfa42f3195922bada1ae29 /activesupport | |
parent | 477d17b31682a7f7f7718ef9fd98e65888c990bc (diff) | |
parent | 67c40160d384037d664952cee808a49104bdc627 (diff) | |
download | rails-8601f163a8017950a4693855ebaa9141d443e277.tar.gz rails-8601f163a8017950a4693855ebaa9141d443e277.tar.bz2 rails-8601f163a8017950a4693855ebaa9141d443e277.zip |
Merge branch 'master' of https://github.com/cylence/docrails into cylence-master
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index d31dad6bc7..b4f0c42e37 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -214,7 +214,7 @@ module ActiveSupport # cache.write(key, value, :expires_in => 1.minute) # Set a lower value for one entry # # Setting <tt>:race_condition_ttl</tt> is very useful in situations where a cache entry - # is used very frequently unver heavy load. If a cache expires and due to heavy load + # is used very frequently and is under heavy load. If a cache expires and due to heavy load # seven different processes will try to read data natively and then they all will try to # write to cache. To avoid that case the first process to find an expired cache entry will # bump the cache expiration time by the value set in <tt>:race_condition_ttl</tt>. Yes |