From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Fri, 19 Oct 2012 12:10:27 +0000 (+0200)
Subject: Merge branch 'senslab2' of ssh://138.96.116.40/git/sfa into senslab2
X-Git-Tag: sfa-2.1-24~3^2~52
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=980ea53e093afd731ac58b829347b3bc165ad6f3;p=sfa.git

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

Conflicts:
	sfa/senslab/slabslices.py
---

980ea53e093afd731ac58b829347b3bc165ad6f3
diff --cc sfa/senslab/slabslices.py
index ded7a133,b00cb930..9d35ba21
--- a/sfa/senslab/slabslices.py
+++ b/sfa/senslab/slabslices.py
@@@ -220,12 -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:
@@@ -750,4 -749,4 +748,4 @@@
                                  #value: %s, node_id: %s\nCause:%s'\
                                  #% (name, value,  node_id, str(error)))
  
-- 
++