git.onelab.eu Git - sfa.git/commit

git://git.onelab.eu / sfa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 470594b 25a8d00)

author	Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
	Sun, 19 Feb 2012 08:29:59 +0000 (09:29 +0100)
committer	Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
	Sun, 19 Feb 2012 08:29:59 +0000 (09:29 +0100)
commit	78467ecd9b02ec60d9572178995ed347fc917f59
tree	b766965af7a59bc531acf0b95d080a8c7faa5498	tree \| snapshot
parent	470594b18884534906813e13b7150464824ace91	commit \| diff
parent	25a8d00081fb6ae5c959112f673a7659242f025b	commit \| diff

Merge branch 'master' into sqlalchemy

Conflicts:
config/default_config.xml
sfa.spec

Removed:
sfa/server/sfa-clean-peer-records.py
sfa/storage/record.py

config/default_config.xml	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history
sfa.spec	diff1 \|	diff2 \|	blob \| history
sfa/managers/registry_manager.py	diff1 \|	diff2 \|	blob \| history
sfa/openstack/nova_driver.py	diff1 \|	diff2 \|	blob \| history

sfa