merged in from trunk -r 17776:17849
authorJosh Karlin <jkarlin@bbn.com>
Thu, 29 Apr 2010 13:58:07 +0000 (13:58 +0000)
committerJosh Karlin <jkarlin@bbn.com>
Thu, 29 Apr 2010 13:58:07 +0000 (13:58 +0000)
commit6930ae21ab9b28ca79284166b5907c99438a58fb
tree1521d0b448489a599b95ae77b866691ab933c54a
parentcd815f4ec1c057f03ce144c3ef234a772ece4b9c
merged in from trunk -r 17776:17849
sfa/managers/aggregate_manager_pl.py
sfa/managers/slice_manager_pl.py
sfa/methods/get_resources.py
sfa/plc/api.py
sfa/plc/nodes.py [deleted file]
sfa/plc/slices.py
sfa/trust/certificate.py
sfa/util/api.py
sfa/util/cache.py [new file with mode: 0644]
sfa/util/server.py
sfa/util/table.py