Merge pull request #6548 from edx/aamir-khan/ECOM-335-caching

ECOM-335 Created new branch from master and put all changes from aamir-k...
2015-01-13 12:11:37 +05:00
parent 1e051e5ef8 beeaec5a55
commit 05575ecce4
9 changed files with 187 additions and 110 deletions
--- a/common/lib/xmodule/xmodule/modulestore/tests/factories.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
@@ -35,7 +35,6 @@ class XModuleFactory(Factory):
    @lazy_attribute
    def modulestore(self):
        from xmodule.modulestore.django import modulestore
-
        return modulestore()