From: Yasin Rahman <loic.baron@lip6.fr>
Date: Tue, 12 May 2015 13:10:33 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.4~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d1b79fec3d01b9286b977b26efdca49bdb21566c;hp=-c;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

d1b79fec3d01b9286b977b26efdca49bdb21566c
diff --combined myslice/settings.py
index b36281b1,262ad065..0e0bf371
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@@ -90,9 -90,6 +90,9 @@@ MANAGERS = ADMIN
  #DEFAULT_FROM_EMAIL = "root@theseus.ipv6.lip6.fr"
  #EMAIL_HOST_PASSWORD = "mypassword"
  
 +if config.myslice.default_sender:
 +    DEFAULT_FROM_EMAIL = config.myslice.default_sender
 +
  EMAIL_HOST = "localhost"
  EMAIL_PORT = 25
  EMAIL_USE_TLS = False
@@@ -365,7 -362,7 +365,7 @@@ CSRF_FAILURE_VIEW = 'manifoldapi.manifo
  
  ####SLA#####
  
- SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
+ SLA_COLLECTOR_URL = "https://157.193.215.125:4001/sla-collector/sla"
  SLA_COLLECTOR_USER = "portal"
  SLA_COLLECTOR_PASSWORD = "password"