fix merging error in iotlabv1Node.py
[sfa.git] / Makefile
2013-05-23 Thierry Parmentelatforce make version to redo no matter what
2013-05-23 Thierry Parmentelatcosmetic
2013-05-02 Thierry Parmentelatembed debian stuff in main Makefile
2013-03-25 Mohamed LarabiMerge Master in geni-v3 conflict resolution sfa-3.0-0
2013-01-24 Thierry ParmentelatMerge branch 'upstreammaster' into senslab2
2013-01-24 Thierry ParmentelatMerge branch 'upstreammaster'
2013-01-22 Thierry Parmentelatmake sync won't work onto debian-based deployments...
2013-01-17 Thierry Parmentelatmerges master (so, no sfa-cm anymore)
2013-01-17 Thierry Parmentelatthis produces a non-empty packagea at last
2013-01-16 Thierry Parmentelatanother simpler, cleaner angle
2013-01-16 Thierry Parmentelatvarious tweaks for debian
2013-01-16 Thierry Parmentelatredirect make debian as make make -f Makefile.debian
2012-06-21 Sandrine AvakianMerge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa...
2012-06-21 Sandrine AvakianMerge branch 'master' into senslab2
2012-06-12 Thierry ParmentelatMerge branch 'upstreammaster'
2012-06-07 Thierry Parmentelatmove clientbin one step upwards
2012-05-29 Sandrine AvakianMerge branch 'master' into senslab2
2012-05-23 Thierry ParmentelatMerge branch 'upstreammaster'
2012-05-09 Thierry Parmentelatadd symlink /usr/bin/sfaadmin (without the .py)
2012-05-07 Thierry Parmentelatfix sync target
2012-04-26 Sandrine AvakianMerge branch 'master' into senslab2
2012-04-24 Thierry ParmentelatMerge branch 'upstreammaster'
2012-04-10 Thierry Parmentelatfix make sync
2012-04-02 Thierry Parmentelatnew make sync for vs or lxc
2012-03-19 Thierry Parmentelatskip pickle files when running make scan
2012-03-15 Tony Mackfix sfaadmin path
2012-03-15 Tony Mackremoved old bins
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 Parmentelatbye syncrica
2012-02-24 Thierry ParmentelatMerge branch 'master' into sqlalchemy
2012-02-19 Thierry ParmentelatMerge branch 'master' into sqlalchemy
2012-02-08 Thierry ParmentelatMerge branch 'sqlalchemy' of ssh://git.onelab.eu/git...
2012-02-08 Thierry Parmentelatsmarter make synclib wrt migrations
2012-02-08 Thierry ParmentelatMerge branch 'master' into sqlalchemy
2012-02-07 Thierry Parmentelatrenaming
2012-02-01 Thierry ParmentelatMerge branch 'master' into sqlalchemy - solved totally...
2012-01-27 Thierry Parmentelatimporter revisited - sfa-import.py sfa-nuke.py (no...
2012-01-27 Thierry Parmentelatmerge master again (2.0-10 changelog only)
2012-01-25 Thierry Parmentelatadd support for migrations with sqlalchemy-migrate
2012-01-24 Thierry ParmentelatMerge branch 'master' into sqlalchemy
2012-01-23 Thierry Parmentelatmore tweaks in the make sync* targets
2012-01-19 Thierry Parmentelatmore modulra make sync* targets
2012-01-17 Thierry Parmentelatsql schema is managed under sqlalchemy, no need for...
2012-01-16 Thierry ParmentelatMerge branch 'upstreammaster'
2012-01-16 Sandrine AvakianMerge branch 'master' into senslab2
2012-01-06 Tony MackMerge branch 'master' of ssh://git.planet-lab.org/git/sfa
2012-01-05 Thierry Parmentelatfirst draft of an added support for migrations in the...
2012-01-05 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2012-01-03 Thierry Parmentelatsync targets more robust
2011-12-16 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-12-16 Thierry Parmentelatconvenience to push the fd driver
2011-12-16 Thierry Parmentelatconvenience to push the federica driver
2011-12-15 Sandrine AvakianMerge branch 'master' into senslab2
2011-12-15 Thierry ParmentelatMerge branch 'upstreammaster'
2011-12-13 Thierry Parmentelatscan xml files
2011-12-08 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-12-08 Thierry Parmentelatsfaclientlib improved
2011-12-07 Thierry Parmentelatminor improvement to packaging
2011-12-07 Thierry Parmentelatextract/separate binary clients in sfa/clientbin
2011-12-07 Thierry Parmentelatconvenience
2011-12-06 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-12-06 Thierry Parmentelatpackage sfascan
2011-12-06 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-12-05 Thierry Parmentelatclientsync
2011-12-01 Thierry Parmentelatminor tweaks
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 Parmentelatmove init.d and cron.d one step up in the source tree
2011-11-18 Nicolas TurroMerge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa...
2011-11-18 Nicolas TurroMerge branch 'master' into senslab2
2011-11-16 Thierry ParmentelatMerge branch 'upstreammaster'
2011-11-15 Thierry Parmentelatwith a slow connection, make fastsync does only the...
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-02 Thierry Parmentelatbetter version.py yet
2011-11-02 Thierry Parmentelatmore realistic way to make version.py
2011-11-01 Thierry Parmentelatisolate import tools in sfa/importer
2011-10-27 Thierry Parmentelatsolve conflicts
2011-10-27 Thierry Parmentelatbeginning/proof-of-concept of a generic/ module togethe...
2011-10-27 Nicolas TurroMerge branch 'master' of ssh://git.f-lab.fr/git/sfa
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 Parmentelatpush initscript when making sync
2011-10-25 Thierry Parmentelatrename sfa-server.py into sfa-start.py
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 Parmentelatadd exclusion when making tags
2011-10-20 Sandrine AvakianMerge branch 'master' into exp2
2011-10-10 smbakerMerge branch 'master' of ssh://bakers@git.planet-lab...
2011-10-10 Tony Mackuse sfa.client.client_helper to generate users list...
next