Merge branch 'geni-v3' of git://git.onelab.eu/sfa into geni-v3
authorLoic Baron <loic.baron@lip6.fr>
Thu, 9 Feb 2017 02:24:33 +0000 (03:24 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 9 Feb 2017 02:24:33 +0000 (03:24 +0100)
commit8e558be62ca1e048cedb76d6036d1acbfa827bd4
treefc6223d253f637af72257a8aa52cf7aa7266550d
parentcee31913874e06771a51fc85edc5c4a9d5d8e08e
parent2d8a644a4959edf9151c51d4d64dbbc9b08dcecc
Merge branch 'geni-v3' of git://git.onelab.eu/sfa into geni-v3
sfa/trust/hierarchy.py