From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 18 Oct 2012 21:06:36 +0000 (-0400)
Subject: merge
X-Git-Tag: sfa-3.0-0~112
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7c97b4323a2ee8c49cf250eb39a36c7609f2b468

merge
---

7c97b4323a2ee8c49cf250eb39a36c7609f2b468
diff --cc sfa/planetlab/plaggregate.py
index 5da16936,e66b4140..ece53ba0
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@@ -372,7 -376,7 +372,13 @@@ class PlAggregate
              rspec.version.add_leases(leases)
  
                 
++<<<<<<< HEAD:sfa/planetlab/plaggregate.py
 +        return {'geni_urn': urns[0], 
 +                'geni_rspec': rspec.toxml(),
 +                'geni_slivers': geni_slivers}
++=======
+         return  {'geni_urn': urns[0],
+                  'geni_rspec': rspec.toxml(),
+                  'geni_slivers': geni_slivers}
++>>>>>>> 3acb26e0ac5bc5de68effe62d0878ba674e40369:sfa/planetlab/plaggregate.py