git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3c2bf5 3acb26e)
merge
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Thu, 18 Oct 2012 21:06:36 +0000 (17:06 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Thu, 18 Oct 2012 21:06:36 +0000 (17:06 -0400)
1  2 
sfa/planetlab/plaggregate.py patch | diff1 | diff2 | blob | history

diff --cc sfa/planetlab/plaggregate.py
index 5da1693,e66b414..ece53ba
--- 1/sfa/planetlab/plaggregate.py
--- 2/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
  
sfa