Merge branch 'master' into senslab2
[sfa.git] / sfa / methods / GetVersion.py
2011-11-14 Sandrine AvakianMerge branch 'senslab2' of ssh://flab-git.pl.sophia...
2011-11-08 smbakerfix merge problem
2011-11-06 Thierry ParmentelatMerge branch 'upstreammaster'
2011-11-06 Thierry ParmentelatMerge branch 'thgeneric'
2011-11-03 Thierry ParmentelatMerge branch 'thgeneric' into senslab2
2011-11-03 Thierry ParmentelatMerge branch 'thgeneric' of ssh://git.onelab.eu/git...
2011-11-03 Thierry ParmentelatMerge branch 'master' into thgeneric
2011-11-03 Thierry Parmentelatmerged master onto senslab2, manually solved conflicts...
2011-11-03 Thierry ParmentelatMerge branch 'upstreammaster'
2011-11-01 Thierry Parmentelatsplit api and driver
2011-10-26 Thierry Parmentelattrimmed useless imports, unstarred all imports
2010-10-22 Thierry Parmentelatextend GetVersion to expose:
2010-10-13 Barış Metinresolve conflict manually
2010-10-12 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2010-10-12 Thierry Parmentelatsfadump more usable
2010-08-03 Tony Mackrenamed api.get_manager() to api.get_interface_manager()
2010-07-30 Tony Mackremove distinction between sfa aggregate and geni_aggregate
2010-06-02 Tony Mackmerging with geni-api branch