Permalink
Browse files

Revert "merge passed options"

This reverts commit f18cd30.
  • Loading branch information...
1 parent f18cd30 commit 989ffe4e0d1fc08d121e5b38eac3fdad534321c7 @bluetrans-deploy bluetrans-deploy committed Jan 7, 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(options)
+ }.merge(@default_options)
@pool = options[:cache] || MemCache.new(@default_options[:memcache_server], @default_options)
unless @pool.servers.any? { |s| s.alive? }

0 comments on commit 989ffe4

Please sign in to comment.