Merge branch 'senslab2' of ssh://138.96.116.40/git/sfa into senslab2

Conflicts:
	sfa/senslab/slabslices.py

diff --git a/sfa/senslab/slabslices.py b/sfa/senslab/slabslices.py
index b00cb93..9d35ba2 100644 (file)
--- a/sfa/senslab/slabslices.py
+++ b/sfa/senslab/slabslices.py
@@ -220,11 +220,10 @@ class SlabSlices:
 
                 else: 
                         #New lease 
-                        logger.debug("SLABSLICES verify_slice_leases NEW LEASE")
                         job = requested_jobs_dict[str(start_time)]
-                            self.driver.AddLeases(job['hostname'], \
-                            sfa_slice, int(job['start_time']), \
-                            int(job['duration']))
+                        self.driver.AddLeases(job['hostname'], \
+                                sfa_slice, int(job['start_time']), \
+                                int(job['duration']))
 
             #Deleted leases are the ones with lease id not declared in the Rspec
             if deleted_leases:
@@ -749,4 +748,4 @@ class SlabSlices:
                                 #value: %s, node_id: %s\nCause:%s'\
                                 #% (name, value,  node_id, str(error)))
 
- 
\ No newline at end of file
+