diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-30 02:35:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-30 02:35:24 +0200 |
| commit | ccd45618ed9a629c9535a5ff84ef5c238befa4ab (patch) | |
| tree | 0a582bf695dce01240762d2b8516efde43bc3515 /activesupport/lib/active_support/cache.rb | |
| parent | 3c3ff1377d17b584dd14d85c7cecab59ddff2679 (diff) | |
| parent | 755af497555fde16db86f7e51f6462b0aca79b49 (diff) | |
| download | rails-ccd45618ed9a629c9535a5ff84ef5c238befa4ab.tar.gz rails-ccd45618ed9a629c9535a5ff84ef5c238befa4ab.tar.bz2 rails-ccd45618ed9a629c9535a5ff84ef5c238befa4ab.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activesupport/lib/active_support/cache.rb')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 037cfffae2..8e90de110a 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -19,8 +19,6 @@ module ActiveSupport autoload :SynchronizedMemoryStore, 'active_support/cache/synchronized_memory_store' autoload :CompressedMemCacheStore, 'active_support/cache/compressed_mem_cache_store' - EMPTY_OPTIONS = {}.freeze - # These options mean something to all cache implementations. Individual cache # implementations may support additional options. UNIVERSAL_OPTIONS = [:namespace, :compress, :compress_threshold, :expires_in, :race_condition_ttl] |