From 02ef0460fbfc4904e7c66788588ce671b78f5d48 Mon Sep 17 00:00:00 2001 From: Mohamed Larabi Date: Tue, 4 Jun 2013 17:54:41 +0200 Subject: [PATCH] slab: resolve merge conflict --- sfa/senslab/slabaggregate.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py index 0c626843..2d38a7b0 100644 --- a/sfa/senslab/slabaggregate.py +++ b/sfa/senslab/slabaggregate.py @@ -252,15 +252,10 @@ class SlabAggregate: rspec_node['slivers'] = [sliver] # slivers always provide the ssh service -<<<<<<< HEAD - login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], 'port':'22', 'username': sliver['name']}) - service = ServicesElement({'login': login}) -======= login = Login({'authentication': 'ssh-keys', \ 'hostname': node['hostname'], 'port':'22', \ 'username': sliver['name']}) service = Services({'login': login}) ->>>>>>> 1de733e... Adding check to ensure the required expirement is of 10 min rspec_node['services'] = [service] rspec_nodes.append(rspec_node) -- 2.47.0