diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-03-03 10:48:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 10:48:41 +0000 |
| commit | c9bc4de19850ce3e66d0bf1f9ef70468c0366670 (patch) | |
| tree | d6610b4eb96c4c69bb69a486c43d270ce1b46b82 /activesupport/lib/active_support/cache | |
| parent | e1a72fef7de9a5c0871b0ef1a4acb9483d2bf1f3 (diff) | |
| parent | 75924c4517c8f87712d3f59c11f10152ed57b9d8 (diff) | |
| download | rails-c9bc4de19850ce3e66d0bf1f9ef70468c0366670.tar.gz rails-c9bc4de19850ce3e66d0bf1f9ef70468c0366670.tar.bz2 rails-c9bc4de19850ce3e66d0bf1f9ef70468c0366670.zip | |
Merge pull request #28204 from rails/deprecate-implicit-coercion-of-durations
Deprecate implicit coercion of `ActiveSupport::Duration`
Diffstat (limited to 'activesupport/lib/active_support/cache')
| -rw-r--r-- | activesupport/lib/active_support/cache/mem_cache_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb index e09cee3335..5eee04a34e 100644 --- a/activesupport/lib/active_support/cache/mem_cache_store.rb +++ b/activesupport/lib/active_support/cache/mem_cache_store.rb @@ -156,7 +156,7 @@ module ActiveSupport expires_in = options[:expires_in].to_i if expires_in > 0 && !options[:raw] # Set the memcache expire a few minutes in the future to support race condition ttls on read - expires_in += 5.minutes + expires_in += 300 end rescue_error_with false do @data.send(method, key, value, expires_in, options) |