diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-12-12 23:56:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 23:56:38 +0900 |
| commit | ae7624571bf28484639c10b67ea32191343a5645 (patch) | |
| tree | 740e1f9000bb135cc08b258551cedf8b6c13beb2 /activesupport | |
| parent | e48704db8e6021b690b1fe2b362c7cb2e624e173 (diff) | |
| parent | 17b9c264cb709be556c84f1877f12bc50f0637c3 (diff) | |
| download | rails-ae7624571bf28484639c10b67ea32191343a5645.tar.gz rails-ae7624571bf28484639c10b67ea32191343a5645.tar.bz2 rails-ae7624571bf28484639c10b67ea32191343a5645.zip | |
Merge pull request #31416 from meinac/minor_fix_on_active_support_changelog
[ci skip] Fix Active Support Changelog about :race_condition_ttl
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 42c4406967..668c726e1f 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -67,7 +67,7 @@ config.cache_store = :redis_cache_store # Supports all common cache store options (:namespace, :compress, - # :compress_threshold, :expires_in, :race_condition_tool) and all + # :compress_threshold, :expires_in, :race_condition_ttl) and all # Redis options. cache_password = Rails.application.secrets.redis_cache_password config.cache_store = :redis_cache_store, driver: :hiredis, |