From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 10 Mar 2015 14:26:19 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~58^2^2~2
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=e94639e8556463159fbc42a1834df818b5a83c05

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

e94639e8556463159fbc42a1834df818b5a83c05
diff --cc portal/slicetabexperiment.py
index 324ee0a9,1779d1c8..ab2fee2e
--- a/portal/slicetabexperiment.py
+++ b/portal/slicetabexperiment.py
@@@ -78,8 -78,8 +78,9 @@@ class ExperimentView (FreeAccessView, T
          #print "list of nitos res hrns"
          #print nitos_resource_list
  
 +        all_users = list() 
          #get all  iotlab users
+         all_users = list() 
          try:
              engine = ConfigEngine()
              userData = "Basic " + (engine.iotlab_admin_user() + ":" + engine.iotlab_admin_password()).encode("base64").rstrip()