git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f67085b d1618de)
Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
authorAndy Bavier <acb@cs.princeton.edu>
Wed, 6 Jul 2011 18:18:36 +0000 (14:18 -0400)
committerAndy Bavier <acb@cs.princeton.edu>
Wed, 6 Jul 2011 18:18:36 +0000 (14:18 -0400)
1  2 
sfa/managers/slice_manager_pl.py patch | diff1 | diff2 | blob | history

diff --cc sfa/managers/slice_manager_pl.py
Simple merge
sfa