Merge branch 'master' into asset-pipeline

djangoapps/heartbeat/urls.py

+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('',
+    url(r'^$', 'heartbeat.views.heartbeat', name='heartbeat'),
+)

djangoapps/heartbeat/views.py

+import json
+from datetime import datetime
+from django.http import HttpResponse
+
+def heartbeat(request):
+    """
+    Simple view that a loadbalancer can check to verify that the app is up
+    """
+    output = {
+        'date': datetime.now().isoformat()
+    }
+    return HttpResponse(json.dumps(output, indent=4))

urls.py

@@ -67,6 +67,7 @@ if settings.COURSEWARE_ENABLED:
         url(r'^edit_circuit/(?P<circuit>[^/]*)$', 'circuit.views.edit_circuit'),
         url(r'^save_circuit/(?P<circuit>[^/]*)$', 'circuit.views.save_circuit'),
         url(r'^calculate$', 'util.views.calculate'),
+        url(r'^heartbeat$', include('heartbeat.urls')),
     )
 
 if settings.ENABLE_MULTICOURSE: