Merge branch 'master' into openstreetbugs

[rails.git] / lib / mem_cache.rb

diff --git a/lib/mem_cache.rb b/lib/mem_cache.rb
index 269b0c3d634bda50ba7c0ea44c6a04365a7fa570..ddb842b533aa57fae216633960d4c94c1f569d10 100644 (file)
--- a/lib/mem_cache.rb
+++ b/lib/mem_cache.rb
@@ -6,7 +6,7 @@ class MemCache < Memcached::Rails
   @@connections = []
 
   def initialize(options = {})
   @@connections = []
 
   def initialize(options = {})

-    options.reverse_merge! :binary_protocol => true, :namespace_separator => ":"
+    options.reverse_merge! :namespace_separator => ":"

 
     super(MEMCACHE_SERVERS, options)
 
 
     super(MEMCACHE_SERVERS, options)