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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 03dc21a 7d41479)

author	Sandrine Avakian <sandrine.avakian@inria.fr>
	Thu, 15 Dec 2011 15:30:45 +0000 (16:30 +0100)
committer	Sandrine Avakian <sandrine.avakian@inria.fr>
	Thu, 15 Dec 2011 15:30:45 +0000 (16:30 +0100)
commit	02a4a59a4a49183ec8c631cc03243b97f4602d50
tree	c210ca1a9933f032e0da4d2aa4dd203c5c03adf3	tree \| snapshot
parent	03dc21a0ac95b4fbe8c950c8dc052955d281cc44	commit \| diff
parent	7d41479ffc629cabcab476a94e4e93be41b29ecf	commit \| diff

Merge branch 'master' into senslab2

Conflicts:
sfa/client/sfi.py
sfa/methods/CreateSliver.py
sfa/plc/plslices.py

setup.py	diff1 \|	diff2 \|	blob \| history
sfa/client/sfi.py	diff1 \|	diff2 \|	blob \| history
sfa/managers/driver.py	diff1 \|	diff2 \|	blob \| history
sfa/methods/CreateSliver.py	diff1 \|	diff2 \|	blob \| history
sfa/methods/ListResources.py	diff1 \|	diff2 \|	blob \| history
sfa/plc/plslices.py	diff1 \|	diff2 \|	blob \| history

sfa