6 Commits

Author	SHA1	Message	Date
Usman Khalid	6cb62f2697	Rebase upgrade Django to v1.8.5 ... Please note that this is a squshed commit and the work of: Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar	2015-11-10 15:00:19 -05:00
Jesse Zoldak	6f1bccd565	Mock the modulestore for the heartbeat tests	2014-12-01 20:18:08 -05:00
stv	cf9308144d	Fix PEP8: E302 expected 2 blank lines, found 1	2014-11-10 11:00:11 -08:00
Nimisha Asthagiri	8de4bcaf28	Fix modulestore merge conflict with heartbeat.	2014-06-27 13:57:33 -04:00
Nimisha Asthagiri	a9213509c3	Enable Mixed Modulestore STUD-1540 ... Refactor get_parent_locations STUD-1663	2014-06-26 18:00:11 -04:00
Don Mitchell	3c9b10112f	Refactor heartbeat to delegate to the modulestores and sql ... LMS-2801	2014-06-16 13:16:32 -04:00