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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: a359215 0425553)

author	Sandrine Avakian <sandrine.avakian@inria.fr>
	Wed, 29 Feb 2012 12:33:11 +0000 (13:33 +0100)
committer	Sandrine Avakian <sandrine.avakian@inria.fr>
	Wed, 29 Feb 2012 12:33:11 +0000 (13:33 +0100)
commit	3d51e29695f79b143974f5cf7b2e104d89626ba4
tree	9bc95574d28fe030a6dc2ebc3465b83fb5627320	tree \| snapshot
parent	a3592153928c985fa96fe3fdaad1b694e6e3e90f	commit \| diff
parent	04255538dbacfa52a45e8439b9c9ea590a82dc47	commit \| diff

Merge branch 'master' into senslab2

Conflicts:
sfa/server/sfa-start.py

setup.py	diff1 \|	diff2 \|	blob \| history
sfa/client/sfi.py	diff1 \|	diff2 \|	blob \| history
sfa/methods/CreateSliver.py	diff1 \|	diff2 \|	blob \| history
sfa/server/sfa-start.py	diff1 \|	diff2 \|	blob \| history
sfa/trust/credential.py	diff1 \|	diff2 \|	blob \| history
sfa/util/sfatablesRuntime.py	diff1 \|	diff2 \|	blob \| history
sfa/util/xrn.py	diff1 \|	diff2 \|	blob \| history

sfa