SALOME platform Git repositories - modules/kernel.git/commit

]> SALOME platform Git repositories - modules/kernel.git/commit

projects / modules / kernel.git / commit

author	secher <secher>
	Wed, 3 Oct 2007 08:43:13 +0000 (08:43 +0000)
committer	secher <secher>
	Wed, 3 Oct 2007 08:43:13 +0000 (08:43 +0000)
commit	323d7396fa954ef93a77cb6bc0cedee432f92845
tree	555a24bd402ecd0947db7e52f54580b29ef10d03	tree \| snapshot
parent	64c42bdfb264bf9ef0065056f5406476827e748a	commit \| diff

resolve conflicts from merge with BR_V326p4_resman branch

65 files changed:

bin/Makefile.am		diff \| blob \| history
bin/appliskel/killCurrentPort		diff \| blob \| history
bin/appliskel/runRemote.sh		diff \| blob \| history
bin/launchConfigureParser.py		diff \| blob \| history
bin/orbmodule.py		diff \| blob \| history
bin/runSalome.py		diff \| blob \| history
bin/shutdownSalome.py	[new file with mode: 0755]	blob
bin/waitContainers.py	[new file with mode: 0755]	blob
bin/waitNS.py	[new file with mode: 0755]	blob
configure.ac		diff \| blob \| history
idl/SALOMEDS.idl		diff \| blob \| history
idl/SALOME_ContainerManager.idl		diff \| blob \| history
idl/SALOME_Registry.idl		diff \| blob \| history
resources/CatalogResources.xml.in		diff \| blob \| history
salome_adm/unix/config_files/check_mpi.m4		diff \| blob \| history
src/Batch/BatchLight_BatchManager.cxx	[new file with mode: 0644]	blob
src/Batch/BatchLight_BatchManager.hxx	[new file with mode: 0644]	blob
src/Batch/BatchLight_BatchManager_PBS.cxx	[new file with mode: 0644]	blob
src/Batch/BatchLight_BatchManager_PBS.hxx	[new file with mode: 0644]	blob
src/Batch/BatchLight_BatchManager_SLURM.cxx	[new file with mode: 0644]	blob
src/Batch/BatchLight_BatchManager_SLURM.hxx	[new file with mode: 0644]	blob
src/Batch/BatchLight_Job.cxx	[new file with mode: 0644]	blob
src/Batch/BatchLight_Job.hxx	[new file with mode: 0644]	blob
src/Batch/Makefile.am		diff \| blob \| history
src/Batch/MpiImpl.cxx	[new file with mode: 0644]	blob
src/Batch/MpiImpl.hxx	[new file with mode: 0644]	blob
src/Container/Container_i.cxx		diff \| blob \| history
src/Container/Makefile.am		diff \| blob \| history
src/Container/SALOME_ContainerManager.cxx		diff \| blob \| history
src/Container/SALOME_ContainerManager.hxx		diff \| blob \| history
src/Container/SALOME_ContainerManagerServer.cxx	[deleted file]	blob \| history
src/Container/TestContainerManager.cxx	[deleted file]	blob \| history
src/HDFPersist/Makefile.am		diff \| blob \| history
src/Launcher/Makefile.am	[new file with mode: 0644]	blob
src/Launcher/SALOME_Launcher.cxx	[new file with mode: 0644]	blob
src/Launcher/SALOME_Launcher.hxx	[new file with mode: 0644]	blob
src/Launcher/SALOME_LauncherServer.cxx	[new file with mode: 0644]	blob
src/LifeCycleCORBA/Makefile.am		diff \| blob \| history
src/LifeCycleCORBA/SALOME_FileTransferCORBA.cxx		diff \| blob \| history
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx		diff \| blob \| history
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx		diff \| blob \| history
src/LifeCycleCORBA/Test/LifeCycleCORBATest.cxx		diff \| blob \| history
src/LifeCycleCORBA/Test/TestLifeCycleCORBA.py		diff \| blob \| history
src/LifeCycleCORBA/TestContainerManager.cxx	[new file with mode: 0644]	blob
src/LifeCycleCORBA_SWIG/Test/TestLifeCycleCORBA_SWIG.py		diff \| blob \| history
src/Makefile.am		diff \| blob \| history
src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx		diff \| blob \| history
src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx		diff \| blob \| history
src/NamingService/SALOME_NamingService.cxx		diff \| blob \| history
src/Registry/RegistryService.cxx		diff \| blob \| history
src/Registry/RegistryService.hxx		diff \| blob \| history
src/Registry/SALOME_Registry_Server.cxx		diff \| blob \| history
src/ResourcesManager/Makefile.am		diff \| blob \| history
src/ResourcesManager/SALOME_LoadRateManager.cxx		diff \| blob \| history
src/ResourcesManager/SALOME_LoadRateManager.hxx		diff \| blob \| history
src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx		diff \| blob \| history
src/ResourcesManager/SALOME_ResourcesCatalog_Handler.hxx		diff \| blob \| history
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx		diff \| blob \| history
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx		diff \| blob \| history
src/ResourcesManager/SALOME_ResourcesManager.cxx		diff \| blob \| history
src/ResourcesManager/SALOME_ResourcesManager.hxx		diff \| blob \| history
src/SALOMEDS/SALOMEDS_StudyManager_i.hxx		diff \| blob \| history
src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx		diff \| blob \| history
src/SALOMELocalTrace/LocalTraceBufferPool.hxx		diff \| blob \| history
src/UnitTests/UnitTests.py		diff \| blob \| history

SALOME Kernel module

RSS Atom