Permalink
Browse files

merge passed options

  • Loading branch information...
1 parent 10ec012 commit f18cd3045b2d7e7463df78d264de2f9dc138122e @bluetrans-deploy bluetrans-deploy committed Jan 6, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 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? }

0 comments on commit f18cd30

Please sign in to comment.