Merge pull request #1960 from zz9pzza/issue_4178

issue 4178 : Fixes broken on test
otwcode · Dec 28, 2014 · 842949a · 842949a
2 parents d953e5d + e4a90e2
commit 842949a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -30,7 +30,7 @@
   # Use a different cache store in production
   config.cache_store = :mem_cache_store, YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL']
   config.cache_store = :dalli_store, YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL'] ,
-                          { :namespace =>  ArchiveConfig.MEMCACHE_NAMESPACE || "ao3-v1", :expires_in => ArchiveConfig.MEMCACHE_DEF_EXPIRE || 0, :compress => true , :pool_size => 10 }
+                          { :namespace =>  'ao3-v1', :expires_in =>  0, :compress => true , :pool_size => 10 }
 
   # Disable Rails's static asset server
   # In production, Apache or nginx will already do this

diff --git a/config/environments/staging.rb b/config/environments/staging.rb
@@ -29,7 +29,7 @@
 
   # Use a different cache store in production
   config.cache_store = :dalli_store, YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL'] ,
-                          {  :namespace =>  ArchiveConfig.MEMCACHE_NAMESPACE || "ao3-v1", :expires_in => ArchiveConfig.MEMCACHE_DEF_EXPIRE || 0,  :compress => true , :pool_size => 5 }
+                          {  :namespace =>  'ao3-v1', :expires_in => 0,  :compress => true , :pool_size => 5 }
 
   # Disable Rails's static asset server
   # In production, Apache or nginx will already do this