Merge from jdong

[selectricity] / config / environments / development.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 12a3e04e5fb70df7ae8d679999e2ee76cd50fe20..198c2bdafe91f92df9e624308df375b3dec695b2 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,5 +1,6 @@
 # Settings specified here will take precedence over those in config/environment.rb
-
+#disable memcache
+Cache=nil
 # In the development environment your application's code is reloaded on
 # every request.  This slows down response time but is perfect for development
 # since you don't have to restart the webserver when you make code changes.