git.onelab.eu Git - sfa.git/commit

author	Josh Karlin <jkarlin@bbn.com>
	Mon, 12 Apr 2010 18:15:22 +0000 (18:15 +0000)
committer	Josh Karlin <jkarlin@bbn.com>
	Mon, 12 Apr 2010 18:15:22 +0000 (18:15 +0000)
commit	ee524e1beef10664533d293cb3669db5d2c5fb67
tree	dcbd163423b34a3bb22346fbcc9117a6d00ec200	tree \| snapshot
parent	ac44e44cf5788fb0d4f547002232e1b74372f0cf	commit \| diff

Merged trunk in from 17245:17645

33 files changed:

TODO		diff \| blob \| history
config/default_config.xml		diff \| blob \| history
setup.py		diff \| blob \| history
sfa.spec		diff \| blob \| history
sfa/client/sfi.py		diff \| blob \| history
sfa/managers/aggregate_manager_pl.py		diff \| blob \| history
sfa/managers/registry_manager_pl.py		diff \| blob \| history
sfa/managers/slice_manager_pl.py		diff \| blob \| history
sfa/methods/CreateSliver.py	[new file with mode: 0644]	blob
sfa/methods/ListResources.py	[new file with mode: 0644]	blob
sfa/methods/get_credential.py		diff \| blob \| history
sfa/methods/get_resources.py		diff \| blob \| history
sfa/methods/get_trusted_certs.py		diff \| blob \| history
sfa/plc/api.py		diff \| blob \| history
sfa/plc/nodes.py		diff \| blob \| history
sfa/plc/slices.py		diff \| blob \| history
sfa/server/aggregate.py		diff \| blob \| history
sfa/server/interface.py	[new file with mode: 0644]	blob
sfa/server/modpython/SfaAggregateModPython.py	[moved from sfa/server/SfaAggregateModPython.py with 100% similarity]	blob \| history
sfa/server/modpython/SfaRegistryModPython.py	[moved from sfa/server/SfaRegistryModPython.py with 100% similarity]	blob \| history
sfa/server/modpython/SfaSliceMgrModPython.py	[moved from sfa/server/SfaSliceMgrModPython.py with 100% similarity]	blob \| history
sfa/server/modpython/sfa.aggregate.httpd.conf	[moved from sfa/server/sfa.aggregate.httpd.conf with 100% similarity]	blob \| history
sfa/server/modpython/sfa.registry.httpd.conf	[moved from sfa/server/sfa.registry.httpd.conf with 100% similarity]	blob \| history
sfa/server/modpython/sfa.slicemgr.httpd.conf	[moved from sfa/server/sfa.slicemgr.httpd.conf with 100% similarity]	blob \| history
sfa/server/registry.py		diff \| blob \| history
sfa/server/sfa-server.py		diff \| blob \| history
sfa/server/sfa_component_setup.py		diff \| blob \| history
sfa/trust/auth.py		diff \| blob \| history
sfa/trust/rights.py		diff \| blob \| history
sfa/util/api.py		diff \| blob \| history
sfa/util/record.py		diff \| blob \| history
sfa/util/server.py		diff \| blob \| history
sfa/util/table.py		diff \| blob \| history

sfa

RSS Atom