From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 9 Sep 2013 09:21:40 +0000 (+0200)
Subject: FIX: conflict in settings.py
X-Git-Tag: myslice-0.2-2~1^2~5
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=1aea42c3668602aacfe22bc762ee939672129f53

FIX: conflict in settings.py
---

1aea42c3668602aacfe22bc762ee939672129f53
diff --cc myslice/config.py
index 6ef50617,4edd3882..f6285b25
--- a/myslice/config.py
+++ b/myslice/config.py
@@@ -1,16 -1,17 +1,17 @@@
  class Config:
  
-     # production should use https of course
+ # this version of unfold expects a backend that runs a new API
  
- # an old-fashioned API - that's what is currently only supported   
-     #manifold_url = "http://manifold.pl.sophia.inria.fr:7080/"
-     manifold_url = "http://localhost:7080/"
- # this one runs a new API, but currently (april 2013) there are missing
- # features; GetSession and GetPersons are still there (they should go away) and 
- # the code for retrieving metadata does not work as-is, and I have no clue 
- # what it should become anyways, so...
- #    manifold_url = "http://dev.myslice.info:7080/"
+ # production should probably use https of course
  
+ 
+ # if you use a development backend running on this box
+ #    manifold_url = "http://localhost:7080/"
+ # the INRIA setup
+ #    manifold_url = "http://manifold.pl.sophia.inria.fr:7080/"
+ # the OpenLab-wide backend as managed by UPMC
 -    manifold_url = "http://dev.myslice.info:7080/"
 -
++#    manifold_url = "http://dev.myslice.info:7080/" # development version
++     manifold_url = "http://test.myslice.info:7080/" #stable manifol
      # exporting these details to js
      @staticmethod
      def manifold_js_export ():