merge passed options

rails · Jan 6, 2011 · f18cd30 · f18cd30
1 parent 10ec012
commit f18cd30
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/actionpack/lib/action_controller/session/mem_cache_store.rb b/actionpack/lib/action_controller/session/mem_cache_store.rb
@@ -13,7 +13,7 @@ def initialize(app, options = {})
           @default_options = {
             :namespace => 'rack:session',
             :memcache_server => 'localhost:11211'
-          }.merge(@default_options)
+          }.merge(options)
 
           @pool = options[:cache] || MemCache.new(@default_options[:memcache_server], @default_options)
           unless @pool.servers.any? { |s| s.alive? }