git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0c48de e8b16b9)
Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 5 Jul 2012 15:00:08 +0000 (17:00 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 5 Jul 2012 15:00:08 +0000 (17:00 +0200)
1  2 
sfa/client/sfi.py patch | diff1 | diff2 | blob | history
sfa/planetlab/plslices.py patch | diff1 | diff2 | blob | history
sfa/util/xrn.py patch | diff1 | diff2 | blob | history

diff --cc sfa/client/sfi.py
Simple merge
diff --cc sfa/planetlab/plslices.py
Simple merge
diff --cc sfa/util/xrn.py
Simple merge
sfa