Merge branch 'geni-v3' of git://git.onelab.eu/sfa into geni-v3
authorLoic Baron <loic.baron@lip6.fr>
Fri, 10 Feb 2017 02:58:20 +0000 (03:58 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 10 Feb 2017 02:58:20 +0000 (03:58 +0100)
commit8c0bf91e46675c699393dc209794ade4733ef3da
tree12f78fbc197e91d59135294a7789a0fdca868bc1
parent8e558be62ca1e048cedb76d6036d1acbfa827bd4
parenta89ccd803a21501565e4f4432293a907f168b972
Merge branch 'geni-v3' of git://git.onelab.eu/sfa into geni-v3
sfa/trust/hierarchy.py