diff options
| author | Abdelkader Boudih <terminale@gmail.com> | 2015-03-05 10:12:31 +0000 |
|---|---|---|
| committer | Abdelkader Boudih <terminale@gmail.com> | 2015-03-05 10:12:31 +0000 |
| commit | 72b3b2c9d6cc93fa06f818b3cd8632b3fce6a75e (patch) | |
| tree | d6887b567c5fefe6ed338d9c7aa631eeb21e92c5 | |
| parent | bb456c0a43bf942fa4968e0192402b503fe47997 (diff) | |
| parent | ce46dfea42f4c7028b800977428455332eeacded (diff) | |
| download | rails-72b3b2c9d6cc93fa06f818b3cd8632b3fce6a75e.tar.gz rails-72b3b2c9d6cc93fa06f818b3cd8632b3fce6a75e.tar.bz2 rails-72b3b2c9d6cc93fa06f818b3cd8632b3fce6a75e.zip | |
Merge pull request #19209 from sivsushruth/doc_fix
Doc fix [ci skip]
| -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 d229ba52e2..625be2c959 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -568,7 +568,7 @@ module ActiveSupport race_ttl = options[:race_condition_ttl].to_i if race_ttl && (Time.now.to_f - entry.expires_at <= race_ttl) # When an entry has :race_condition_ttl defined, put the stale entry back into the cache - # for a brief period while the entry is begin recalculated. + # for a brief period while the entry is being recalculated. entry.expires_at = Time.now + race_ttl write_entry(key, entry, :expires_in => race_ttl * 2) else |