Merge Master in geni-v3 conflict resolution
[sfa.git] / sfa / server / sfaapi.py
2013-03-25 Mohamed LarabiMerge Master in geni-v3 conflict resolution sfa-3.0-0
2012-12-04 Tony Mackfix AttributeError when loading credential of unknown...
2012-10-18 Tony Mackmerge
2012-10-18 Tony MackFix GetVersion()
2012-09-04 Sandrine AvakianMerge branch 'master' into senslab2
2012-09-04 Sandrine AvakianMerge branch 'upstreammaster'
2012-09-03 Thierry ParmentelatMerge branch 'geni-v2' and master
2012-08-31 Tony Mackremove default am_code = None from 'code' return
2012-08-30 Sandrine AvakianMerge branch 'master' into senslab2
2012-08-30 Thierry ParmentelatMerge branch 'upstreammaster'
2012-08-16 Tony Mackadded geni_api to GetVersion output
2012-08-07 Tony Mackadded geni_api to GetVersion output
2012-07-16 Tony Mackload sfa_config instead of sfa_config.py
2012-02-29 Sandrine AvakianMerge branch 'master' into senslab2
2012-02-28 Thierry ParmentelatMerge branch 'upstreammaster'
2012-02-24 Thierry ParmentelatMerge branch 'master' into sqlalchemy
2012-02-24 Thierry ParmentelatMerge branch 'master' into sqlalchemy
2012-02-19 Thierry ParmentelatMerge branch 'master' into sqlalchemy
2012-02-08 Thierry ParmentelatMerge branch 'master' into sqlalchemy
2012-02-01 Thierry ParmentelatMerge branch 'master' into sqlalchemy - solved totally...
2012-01-27 Thierry Parmentelatmerge master again (2.0-10 changelog only)
2012-01-26 Thierry Parmentelatrenamed persistentobjs into model
2012-01-25 Thierry Parmentelatadd support for migrations with sqlalchemy-migrate
2012-01-24 Thierry ParmentelatMerge branch 'master' into sqlalchemy
2012-01-20 Thierry Parmentelatcosmetic
2012-01-20 Thierry Parmentelatsymbols starting with __ are reserved
2012-01-19 Thierry Parmentelatmissing import for RecordNotFound
2012-01-17 Thierry Parmentelatfewer uses of SfaTable
2012-01-16 Thierry ParmentelatMerge branch 'upstreammaster'
2012-01-16 Sandrine AvakianMerge branch 'master' into senslab2
2012-01-12 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2012-01-10 smbakeradd optional minimum expiration to getCredential, bette...
2012-01-09 Tony Mackcan now import and use sfa.server.sfaapi withough havin...
2012-01-09 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2012-01-06 Tony MackMerge branch 'master' of ssh://git.planet-lab.org/git/sfa
2012-01-06 Tony Mack'geni_api' should be in the top level struct, not the...
2011-12-29 smbakerMerge branch 'master' of ssh://bakers@git.planet-lab...
2011-12-22 Tony Mackadded 'geni_api' to the return value struct
2011-12-15 Sandrine AvakianMerge branch 'master' into senslab2
2011-12-15 Thierry ParmentelatMerge branch 'upstreammaster'
2011-12-13 Thierry Parmentelatdrop support for API v1, hard-wired v2
2011-12-01 Sandrine AvakianMerge branch 'master' into senslab2
2011-11-30 Thierry ParmentelatMerge branch 'upstreammaster'
2011-11-29 smbakerMerge branch 'master' of ssh://bakers@git.planet-lab...
2011-11-29 Thierry Parmentelatgroup db-related stuff in sfa/storage
2011-11-28 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-11-28 Tony Mackslicemgr also supports GENI AM API v2
2011-11-28 smbakerfix merge problem
2011-11-28 Tony Mackuse sfa.client.return_value.ReturnValue to parse aggreg...
2011-11-25 Nicolas TurroMerge branch 'master' into senslab2
2011-11-25 Thierry ParmentelatMerge branch 'upstreammaster'
2011-11-23 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-11-22 Tony Mackrenamed SFA_AM_API_VERSION to SFA_AGGREGATE_API_VERSION
2011-11-22 Tony Mackfix TypeError
2011-11-22 Tony Macksupport geni am api v2 return values
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-03 Thierry Parmentelathardwire SfaTable as the storage system for now
2011-11-01 Thierry Parmentelatdont need scaffold anymore
2011-11-01 Thierry Parmentelatanother step of moving stuff around where it belongs
2011-11-01 Thierry Parmentelatdefaultdict in sfa.util + minor/cosmetic
2011-10-27 Thierry Parmentelatgeneric to handle the manager instance in the api too
2011-10-27 Thierry Parmentelatsolve conflicts
2011-10-27 Thierry Parmentelatbeginning/proof-of-concept of a generic/ module togethe...
2011-10-27 Tony Mackfix missing imports
2011-10-27 Tony Mackimport os
2011-10-27 Thierry Parmentelatsplit the various *Api classes into somethin more sensible