aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2012-08-27 09:46:52 +0530
committerArun Agrawal <arunagw@gmail.com>2012-08-27 09:46:52 +0530
commit1f5f5cfc363c82f38f0e1b171d1f798c6d5b4402 (patch)
tree087a39638fae540a18b0a6040f68dceac8e4764b /actionpack
parent834a5a9c7eb9ea43af067b8b2b3af0249e4fd461 (diff)
downloadrails-1f5f5cfc363c82f38f0e1b171d1f798c6d5b4402.tar.gz
rails-1f5f5cfc363c82f38f0e1b171d1f798c6d5b4402.tar.bz2
rails-1f5f5cfc363c82f38f0e1b171d1f798c6d5b4402.zip
More fixes for action pack tests with Dalli.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
index 38a737cd2b..14af7eef68 100644
--- a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
@@ -1,15 +1,15 @@
require 'action_dispatch/middleware/session/abstract_store'
-require 'rack/session/memcache'
+require 'rack/session/dalli'
module ActionDispatch
module Session
- class MemCacheStore < Rack::Session::Memcache
+ class MemCacheStore < Rack::Session::Dalli
include Compatibility
include StaleSessionCheck
include SessionObject
def initialize(app, options = {})
- require 'memcache'
+ require 'dalli'
options[:expire_after] ||= options[:expires]
super
end