merge with geni_api branch
authorTony Mack <tmack@cs.princeton.edu>
Thu, 10 Jun 2010 18:16:05 +0000 (18:16 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Thu, 10 Jun 2010 18:16:05 +0000 (18:16 +0000)
commit731ec9fdd043e15f1f1da3b4a42f0cb7a941f835
tree2f07349199e135e7f0087f02fb7e3b98d3d2388e
parent70cc55f3ae42ebb61805a4a62ef3a623152cda96
merge with geni_api branch
config/geni_aggregates.xml
sfa/managers/geni_am_pl.py
sfa/trust/hierarchy.py
sfa/util/server.py