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)
commitb2d3e37b8c36a60f2449c235e0b4f7d2942e3292
tree4280f1f352714b886d4d8afa62cb6eaacb378076
parentf67085b8ddda9988e16c60c723642c29f45b2c5f
parentd1618de5ce6d251957494931d62ef19e21edabee
Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
sfa/managers/slice_manager_pl.py