From: Javier García <javier.garcial.external@atos.net>
Date: Mon, 27 Apr 2015 09:18:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/onelab' into onelab
X-Git-Tag: myslice-1.3~4^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=770855394e23c5fc3e7862fe5bc7a4cd34476015;hp=4abf1ba38cc3be9f76f085857e0bff0e799cba19;p=unfold.git

Merge remote-tracking branch 'origin/onelab' into onelab
---

diff --git a/myslice/settings.py b/myslice/settings.py
index 1581d396..d3228482 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -360,6 +360,6 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
 ####SLA#####
 
 SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
-#SLA_COLLECTOR_URL = "http://172.24.76.19:8000/sla"
+#SLA_COLLECTOR_URL = "http://172.24.76.19:8000/sla" // TODO: Remove line
 SLA_COLLECTOR_USER = "portal"
 SLA_COLLECTOR_PASSWORD = "password"