diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-05-01 15:14:16 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-05-01 15:14:16 -0300 |
| commit | d007137430f1f996c444a7227c1f206dcd25473e (patch) | |
| tree | 2a8ebcf584ddcde67037d5d3dd2ae5c5db6747ec | |
| parent | 0f6f30f93436b8ce77fcad1c12391351eae36bcd (diff) | |
| parent | f4a72b0cd2bd5eacdf4e0b466d7761f8d1a06ee7 (diff) | |
| download | askbot-d007137430f1f996c444a7227c1f206dcd25473e.tar.gz askbot-d007137430f1f996c444a7227c1f206dcd25473e.tar.bz2 askbot-d007137430f1f996c444a7227c1f206dcd25473e.zip | |
Merge branch 'master' into user-groups
| -rw-r--r-- | askbot/setup_templates/settings.py | 2 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index f9920bca..191d13f3 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -183,7 +183,7 @@ CACHE_TIMEOUT = 6000 CACHE_PREFIX = 'askbot' #make this unique CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True #If you use memcache you may want to uncomment the following line to enable memcached based sessions -#SESSION_ENGINE = 'django.contrib.sessions.backends.cache_db' +#SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db' AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index e39231f0..3287fb18 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -182,7 +182,7 @@ CACHE_TIMEOUT = 6000 CACHE_PREFIX = 'askbot' #make this unique CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True #If you use memcache you may want to uncomment the following line to enable memcached based sessions -#SESSION_ENGINE = 'django.contrib.sessions.backends.cache_db' +#SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db' AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', |