aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2012-08-27 09:46:52 +0530
committerGuillermo Iguaran <guilleiguaran@gmail.com>2012-09-06 17:37:01 -0500
commit7bed3ab404ce1903938449a746291f853260ce11 (patch)
tree703f24f441d3a1ff4259db608842434b31a85260 /actionpack
parentdd6206999172ebc4418c1b7c62862492ce77016c (diff)
downloadrails-7bed3ab404ce1903938449a746291f853260ce11.tar.gz
rails-7bed3ab404ce1903938449a746291f853260ce11.tar.bz2
rails-7bed3ab404ce1903938449a746291f853260ce11.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