merged trunk -r 18510:18539
authorJosh Karlin <jkarlin@bbn.com>
Fri, 30 Jul 2010 18:43:21 +0000 (18:43 +0000)
committerJosh Karlin <jkarlin@bbn.com>
Fri, 30 Jul 2010 18:43:21 +0000 (18:43 +0000)
commit5a9d22d382a20313c622fdc826c3eebb6d3cf586
treeb421b663968d232544d3f6e693da4de820400cb6
parent93c7264013d3bef712023ae955d50b18cdbeb50b
merged trunk -r 18510:18539
12 files changed:
TODO
keyconvert/keyconvert.py
sfa/client/sfi.py
sfa/managers/aggregate_manager_pl.py
sfa/managers/slice_manager_pl.py
sfa/plc/sfa-import-plc.py
sfa/server/interface.py
sfa/trust/credential.py
sfa/util/api.py
sfa/util/rspec.py
sfa/util/sfaticket.py
sfa/util/threadmanager.py [new file with mode: 0755]