Merge branch 'master' into restframework2-filter

1 files changed, 6 insertions, 0 deletions

diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py
index 951b1e72..b48f85e4 100644
--- a/rest_framework/runtests/settings.py
+++ b/rest_framework/runtests/settings.py
@@ -21,6 +21,12 @@ DATABASES = {
     }
 }
 
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+    }
+}
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.