aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-06-06 18:24:02 -0700
committerVipul A M <vipulnsward@gmail.com>2016-06-06 18:24:02 -0700
commitb24d44edbb4726d06df782dc5b4b0e52db467d97 (patch)
tree0221c1bfb0ea1e22f778335e2e072db7d217c3ae /activesupport
parent1621eda81d6abcc13c7755606752710b5d84c49b (diff)
parentf484bb068bd7f023c87445a8d063a40142805613 (diff)
downloadrails-b24d44edbb4726d06df782dc5b4b0e52db467d97.tar.gz
rails-b24d44edbb4726d06df782dc5b4b0e52db467d97.tar.bz2
rails-b24d44edbb4726d06df782dc5b4b0e52db467d97.zip
Merge pull request #25294 from Zorbash/cache-fetch-race-condition-ttl-doc
Change doc for race_condition_ttl option of ActiveSupport::Cache::Sto… [ci skip]
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/cache.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index bc114e0785..179ca13b49 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -250,14 +250,14 @@ module ActiveSupport
# sleep 60
#
# Thread.new do
- # val_1 = cache.fetch('foo', race_condition_ttl: 10) do
+ # val_1 = cache.fetch('foo', race_condition_ttl: 10.seconds) do
# sleep 1
# 'new value 1'
# end
# end
#
# Thread.new do
- # val_2 = cache.fetch('foo', race_condition_ttl: 10) do
+ # val_2 = cache.fetch('foo', race_condition_ttl: 10.seconds) do
# 'new value 2'
# end
# end