From: Loic & Edelberto <loic.baron@lip6.fr>
Date: Thu, 13 Mar 2014 13:40:28 +0000 (-0300)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=17b63c6cadb1f641b328abadd2ca9c0cf34122f2;p=myslice.git

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

Conflicts:
	portal/actions.py
---

17b63c6cadb1f641b328abadd2ca9c0cf34122f2
diff --cc portal/actions.py
index 6955c629,399cae64..ca875435
--- a/portal/actions.py
+++ b/portal/actions.py
@@@ -705,7 -562,7 +705,6 @@@ def create_pending_user(wsgi_request, r
              .filter_by('platform', '==', 'myslice')           \
              .select('platform_id')
          reg_platform = execute_admin_query(wsgi_request, reg_platform_query)
-     
 -
          reg_platform_id = reg_platform[0]['platform_id']
          account_params = {
              'platform_id'   : reg_platform_id, # XXX ALERT !!