Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements

Conflicts:
	cms/one_time_startup.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
This commit is contained in:
Chris Dodge
2013-03-28 13:27:29 -04:00
243 changed files with 8826 additions and 8382 deletions

View File

@@ -9,7 +9,8 @@ from django.core.cache import get_cache, InvalidCacheBackendError
cache = get_cache('mongo_metadata_inheritance')
for store_name in settings.MODULESTORE:
store = modulestore(store_name)
store.metadata_inheritance_cache = cache
store.metadata_inheritance_cache_subsystem = cache
store.request_cache = RequestCache.get_request_cache()
modulestore_update_signal = Signal(
providing_args=['modulestore', 'course_id', 'location']