fix merge problem
[sfa.git] / sfa / managers / slice_manager.py
2011-11-08 smbakerfix merge problem
2011-11-08 smbakeradd exception info to statistics section
2011-11-07 Thierry Parmentelatslice manager implemented as a slice
2011-11-06 Thierry ParmentelatMerge branch 'thgeneric'
2011-11-03 Thierry ParmentelatMerge branch 'master' into thgeneric
2011-11-01 Thierry Parmentelatanother step of moving stuff around where it belongs
2011-10-31 Thierry Parmentelatsolve merge conflict
2011-10-29 Tony Mackno llonger user rspec helper
2011-10-26 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-10-26 Thierry Parmentelatreviewed imports and pylint'ed
2011-10-25 Tony MackMerge branch 'master' of ssh://git.planet-lab.org/git/sfa
2011-10-25 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-10-25 Thierry Parmentelatoops
2011-10-25 Tony MackMerge branch 'master' of ssh://git.planet-lab.org/git/sfa
2011-10-25 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-10-25 Thierry Parmentelatrenamed sfaticket from util/ to trust/
2011-10-25 Tony Mackremoving specdict
2011-10-21 Tony MackMerge branch 'master' of ssh://git.planet-lab.org/git/sfa
2011-10-21 Thierry Parmentelatremoved imports on sfa.util.rspec that is gone
2011-10-20 Tony MackMerge branch 'master' of ssh://git.planet-lab.org/git/sfa
2011-10-20 Thierry Parmentelatnew naming scheme in managers/