merged changes back from live

[selectricity-live] / config / environments / production.rb

diff --git a/config/environments/production.rb b/config/environments/production.rb
old mode 100755 (executable)
new mode 100644 (file)
index 5a4e2b1..20ded00
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,5 +1,9 @@
 # Settings specified here will take precedence over those in config/environment.rb
-
+#
+#Enable memcache
+#require('memcache')
+#Cache=MemCache.new('localhost', :compression => true)
+Cache=nil
 # The production environment is meant for finished, "live" apps.
 # Code is not reloaded between requests
 config.cache_classes = true
@@ -14,5 +18,5 @@ config.action_controller.perform_caching             = true
 # Enable serving of images, stylesheets, and javascripts from an asset server
 # config.action_controller.asset_host                  = "http://assets.example.com"
 
-# Disable delivery errors if you bad email addresses should just be ignored
+# Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false