git.onelab.eu Git - sfa.git/history - sfa/methods/Resolve.py

2010-10-19	Thierry Parmentelat	namespace module is gone, plxrn provides PL-specific...	blob \| commitdiff
2010-10-13	Barış Metin	resolve conflict manually	blob \| commitdiff \| diff to current
2010-10-12	Thierry Parmentelat	Merge branch 'master' of ssh://git.onelab.eu/git/sfa	blob \| commitdiff \| diff to current
2010-10-12	Thierry Parmentelat	sfadump more usable	blob \| commitdiff \| diff to current
2010-10-06	Josh Karlin	merged namespace	blob \| commitdiff \| diff to current
2010-10-04	Tony Mack	Merge branch 'master' of ssh://git.planet-lab.org/git/sfa	blob \| commitdiff \| diff to current
2010-09-30	Thierry Parmentelat	* tried to put some sense in the way things get logged...	blob \| commitdiff \| diff to current
2010-08-06	Tony Mack	remove the cred parameter from registry_manager_pl...	blob \| commitdiff \| diff to current
2010-08-06	Tony Mack	replaceing resolve with Resolve	blob \| commitdiff \| diff to current

sfa