From: Loic Baron Date: Thu, 16 Apr 2015 11:25:16 +0000 (+0200) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.3~37^2~7^2~1 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=4b4122444bd057772e6a408bdcf46d54ce064f96 Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab Conflicts: portal/templates/fed4fire/fed4fire_home-view.html --- 4b4122444bd057772e6a408bdcf46d54ce064f96 diff --cc portal/actions.py index 482a746d,482a746d..aa156a54 --- a/portal/actions.py +++ b/portal/actions.py @@@ -61,8 -61,8 +61,8 @@@ def get_jfed_identity(request) private_key = account_config['user_private_key'] user_hrn = account_config.get('user_hrn','N/A') platform_detail = get_myslice_platform(request) -- #registry = get_registry_url(request) -- registry = 'http://sfa-fed4fire.pl.sophia.inria.fr:12345/' ++ registry = get_registry_url(request) ++ #registry = 'http://sfa-fed4fire.pl.sophia.inria.fr:12345/' jfed_identity = user_hrn + '\n' + registry + '\n' + private_key return jfed_identity else: