• Paul Rich's avatar
    Merge branch 'develop' into qsim · d8607b41
    Paul Rich authored
    This is bringing years of changes and bringing things into line.  This
    commit is to share the branch with the qsim.  The bulk of the work
    should be done here.
    
    Conflicts:
    	README
    	man/POSIX/qalter.1
    	man/POSIX/qdel.1
    	man/POSIX/qhold.1
    	man/POSIX/qmove.1
    	man/POSIX/qrls.1
    	man/POSIX/qselect.1
    	man/POSIX/qstat.1
    	man/POSIX/qsub.1
    	man/cqadm.8
    	man/cqsub.1
    	man/partadm.8
    	man/partlist.1
    	man/releaseres.8
    	man/setres.8
    	man/showres.1
    	man/slpstat.8
    	misc/cobalt
    	misc/cobalt.conf
    	misc/cobalt.spec
    	misc/mk_jobs.py
    	misc/mk_partitions.py
    	misc/mk_queues.py
    	setup.py
    	src/clients/Makefile
    	src/clients/POSIX/qalter.py
    	src/clients/POSIX/qdel.py
    	src/clients/POSIX/qhold.py
    	src/clients/POSIX/qmove.py
    	src/clients/POSIX/qrls.py
    	src/clients/POSIX/qselect.py
    	src/clients/POSIX/qstat.py
    	src/clients/POSIX/qsub.py
    	src/clients/brun.py
    	src/clients/cobalt-mpirun.py
    	src/clients/cqadm.py
    	src/clients/nodeadm.py
    	src/clients/nodelist.py
    	src/clients/partadm.py
    	src/clients/partlist.py
    	src/clients/releaseres.py
    	src/clients/schedctl.py
    	src/clients/setres.py
    	src/clients/showres.py
    	src/clients/slpstat.py
    	src/clients/userres.py
    	src/clients/wrapper.c
    	src/components/qsim.py
    	src/lib/Components/DBWriter/cdbwriter.py
    	src/lib/Components/base.py
    	src/lib/Components/base_forker.py
    	src/lib/Components/bg_base_system.py
    	src/lib/Components/bg_mpirun_forker.py
    	src/lib/Components/bgsched.py
    	src/lib/Components/bgsystem.py
    	src/lib/Components/bqsim.py
    	src/lib/Components/cluster_base_system.py
    	src/lib/Components/cluster_simulator.py
    	src/lib/Components/cluster_system.py
    	src/lib/Components/cqm.py
    	src/lib/Components/cqsim.py
    	src/lib/Components/evsim.py
    	src/lib/Components/histm.py
    	src/lib/Components/pg_forker.py
    	src/lib/Components/qsim_base.py
    	src/lib/Components/simulator.py
    	src/lib/Components/slp.py
    	src/lib/Components/system_script_forker.py
    	src/lib/Components/user_script_forker.py
    	src/lib/Data.py
    	src/lib/DataTypes/ProcessGroup.py
    	src/lib/Exceptions.py
    	src/lib/JSONEncoders.py
    	src/lib/Logging.py
    	src/lib/Proxy.py
    	src/lib/Server.py
    	src/lib/Util.py
    	src/lib/__init__.py
    	src/lib/bridge.py
    	testsuite/TestCobalt/TestComponents/test_base.py
    	testsuite/TestCobalt/TestComponents/test_cqm.py
    	testsuite/TestCobalt/TestServer.py
    	testsuite/TestCobalt/TestUtil.py
    	testsuite/TestCobalt/test_accounting.py
    	tools/export.sh
    d8607b41