Update to SLURM 2.6.4

Based on work of Jason Bacon published in WIP.


* Changes in Slurm 2.6.4
========================
 -- Fixed sh5util to print its usage.
 -- Corrected commit f9a3c7e4e8ec.
 -- Honor ntasks-per-node option with exclusive node allocations.
 -- sched/backfill - Prevent invalid memory reference if bf_continue option is
    configured and slurm is reconfigured during one of the sleep cycles or if
    there are any changes to the partition configuration or if the normal
    scheduler runs and starts a job that the backfill scheduler is actively
    working on.
 -- Update man pages information about acct-freq and JobAcctGatherFrequency
    to reflect only the latest supported format.
 -- Minor document update to include note about PrivateData=Usage for the
    slurm.conf when using the DBD.
 -- Expand information reported with DebugFlags=backfill.
 -- Initiate jobs pending to run in a reservation as soon as the reservation
    becomes active.
 -- Purged expired reservation even if it has pending jobs.
 -- Corrections to calculation of a pending job's expected start time.
 -- Remove some vestigial logic treating job priority of 1 as a special case.
 -- Memory freeing up to avoid minor memory leaks at close of daemons
 -- Updated documentation to give correct units being displayed.
 -- Report AccountingStorageBackupHost with "scontrol show config".
 -- init scripts ignore quotes around Pid file name specifications.
 -- Fixed typo about command case in quickstart.html.
 -- task/cgroup - handle new cpuset files, similar to commit c4223940.
 -- Replace the tempname() function call with mkstemp().
 -- Fix for --cpu_bind=map_cpu/mask_cpu/map_ldom/mask_ldom plus
    --mem_bind=map_mem/mask_mem options, broken in 2.6.2.
 -- Restore default behavior of allocating cores to jobs on a cyclic basis
    across the sockets unless SelectTypeParameters=CR_CORE_DEFAULT_DIST_BLOCK
    or user specifies other distribution options.
 -- Enforce JobRequeue configuration parameter on node failure. Previously
    always requeued the job.
 -- acct_gather_energy/ipmi - Add delay before retry on read error.
 -- select/cons_res with GRES and multiple threads per core, fix possible
    infinite loop.
 -- proctrack/cgroup - Add cgroup create retry logic in case one step is
    starting at the same time as another step is ending and the logic to create
    and delete cgroups overlaps.
 -- Improve setting of job wait "Reason" field.
 -- Correct sbatch documentation and job_submit/pbs plugin "%j" is job ID,
    not "%J" (which is job_id.step_id).
 -- Improvements to sinfo performance, especially for large numbers of
    partitions.
 -- SlurmdDebug - Permit changes to slurmd debug level with "scontrol reconfig"
 -- smap - Avoid invalid memory reference with hidden nodes.
 -- Fix sacctmgr modify qos set preempt+/-=.
 -- BLUEGENE - fix issue where node count wasn't set up correctly when srun
    preforms the allocation, regression in 2.6.3.
 -- Add support for dependencies of job array elements (e.g.
    "sbatch --depend=afterok:123_4 ...") or all elements of a job array (e.g.
    "sbatch --depend=afterok:123 ...").
 -- Add support for new options in sbatch qsub wrapper:
    -W block=true	(wait for job completion)
    Clear PBS_NODEFILE environment variable
 -- Fixed the MaxSubmitJobsPerUser limit in QOS which limited submissions
    a job too early.
 -- sched/wiki, sched/wiki2 - Fix to work with change logic introduced in
    version 2.6.3 preventing Maui/Moab from starting jobs.
 -- Updated the QOS limits documentation and man page.

* Changes in Slurm 2.6.3
========================
 -- Add support for some new #PBS options in sbatch scripts and qsub wrapper:
    -l accelerator=true|false	(GPU use)
    -l mpiprocs=#	(processors per node)
    -l naccelerators=#	(GPU count)
    -l select=#		(node count)
    -l ncpus=#		(task count)
    -v key=value	(environment variable)
    -W depend=opts	(job dependencies, including "on" and "before" options)
    -W umask=#		(set job's umask)
 -- Added qalter and qrerun commands to torque package.
 -- Corrections to qstat logic: job CPU count and partition time format.
 -- Add job_submit/pbs plugin to translate PBS job dependency options to the
    extend possible (no support for PBS "before" options) and set some PBS
    environment variables.
 -- Add spank/pbs plugin to set a bunch of PBS environment variables.
 -- Backported sh5util from master to 2.6 as there are some important
    bugfixes and the new item extraction feature.
 -- select/cons_res - Correct MacCPUsPerNode partition constraint for CR_Socket.
 -- scontrol - for setdebugflags command, avoid parsing "-flagname" as an
    scontrol command line option.
 -- Fix issue with step accounting if a job is requeued.
 -- Close file descriptors on exec of prolog, epilog, etc.
 -- Fix issue when a user has held a job and then sets the begin time
    into the future.
 -- Scontrol - Enable changing a job's stdout file.
 -- Fix issues where memory or node count of a srun job is altered while the
    srun is pending.  The step creation would use the old values and possibly
    hang srun since the step wouldn't be able to be created in the modified
    allocation.
 -- Add support for new SchedulerParameters value of "bf_max_job_part", the
    maximum depth the backfill scheduler should go in any single partition.
 -- acct_gather/infiniband plugin - Correct packets_in/out values.
 -- BLUEGENE - Don't ignore a conn-type request from the user.
 -- BGQ - Force a request on a Q for a MESH to be a TORUS in a dimension that
    can only be a TORUS (1).
 -- Change max message length from 100MB to 1GB before generating "Insane
    message length" error.
 -- sched/backfill - Prevent possible memory corruption due to use of
    bf_continue option and long running scheduling cycle (pending jobs could
    have been cancelled and purged).
 -- CRAY - fix AcceleratorAllocation depth correctly for basil 1.3
 -- Created the environment variable SLURM_JOB_NUM_NODES for srun jobs and
    updated the srun man page.
 -- BLUEGENE/CRAY - Don't set env variables that pertain to a node when Slurm
    isn't doing the launching.
 -- gres/gpu and gres/mic - Do not treat the existence of an empty gres.conf
    file as a fatal error.
 -- Fixed for if hours are specified as 0 the time days-0:min specification
    is not parsed correctly.
 -- switch/nrt - Fix for memory leak.
 -- Subtract the PMII_COMMANDLEN_SIZE in contribs/pmi2/pmi2_api.c to prevent
    certain implementation of snprintf() to segfault.

* Changes in Slurm 2.6.2
========================
 -- Fix issue with reconfig and GrpCPURunMins
 -- Fix of wrong node/job state problem after reconfig
 -- Allow users who are coordinators update their own limits in the accounts
    they are coordinators over.
 -- BackupController - Make sure we have a connection to the DBD first thing
    to avoid it thinking we don't have a cluster name.
 -- Correct value of min_nodes returned by loading job information to consider
    the job's task count and maximum CPUs per node.
 -- If running jobacct_gather/none fix issue on unpacking step completion.
 -- Reservation with CoreCnt: Avoid possible invalid memory reference.
 -- sjstat - Add man page when generating rpms.
 -- Make sure GrpCPURunMins is added when creating a user, account or QOS with
    sacctmgr.
 -- Fix for invalid memory reference due to multiple free calls caused by
    job arrays submitted to multiple partitions.
 -- Enforce --ntasks-per-socket=1 job option when allocating by socket.
 -- Validate permissions of key directories at slurmctld startup. Report
    anything that is world writable.
 -- Improve GRES support for CPU topology. Previous logic would pick CPUs then
    reject jobs that can not match GRES to the allocated CPUs. New logic first
    filters out CPUs that can not use the GRES, next picks CPUs for the job,
    and finally picks the GRES that best match those CPUs.
 -- Switch/nrt - Prevent invalid memory reference when allocating single adapter
    per node of specific adapter type
 -- CRAY - Make Slurm work with CLE 5.1.1
 -- Fix segfault if submitting to multiple partitions and holding the job.
 -- Use MAXPATHLEN instead of the hardcoded value 1024 for maximum file path
    lengths.
 -- If OverTimeLimit is defined do not declare failed those jobs that ended
    in the OverTimeLimit interval.

* Changes in Slurm 2.6.1
========================
 -- slurmdbd - Allow job derived ec and comments to be modified by non-root
    users.
 -- Fix issue with job name being truncated to 24 chars when sending a mail
    message.
 -- Fix minor issues with spec file, missing files and including files
    erroneously on a bluegene system.
 -- sacct - fix --name and --partition options when using
    accounting_storage/filetxt.
 -- squeue - Remove extra whitespace of default printout.
 -- BGQ - added head ppcfloor as an include dir when building.
 -- BGQ - Better debug messages in runjob_mux plugin.
 -- PMI2 Updated the Makefile.am to build a versioned library.
 -- CRAY - Fix srun --mem_bind=local option with launch/aprun.
 -- PMI2 Corrected buffer size computation in the pmi2_api.c module.
 -- GRES accounting data wrong in database: gres_alloc, gres_req, and gres_used
    fields were empty if the job was not started immediately.
 -- Fix sbatch and srun task count logic when --ntasks-per-node specified,
    but no explicit task count.
 -- Corrected the hdf5 profile user guide and the acct_gather.conf
    documentation.
 -- IPMI - Fix Math bug getting new wattage.
 -- Corrected the AcctGatherProfileType documentation in slurm.conf
 -- Corrected the sh5util program to print the header in the csv file
    only once, set the debug messages at debug() level, make the argument
    check case insensitive and avoid printing duplicate \n.
 -- If cannot collect energy values send message to the controller
    to drain the node and log error slurmd log file.
 -- Handle complete removal of CPURunMins time at the end of the job instead
    of at multifactor poll.
 -- sview - Add missing debug_flag options.
 -- PGSQL - Notes about Postgres functionality being removed in the next
    version of Slurm.
 -- MYSQL - fix issue when rolling up usage and events happened when a cluster
    was down (slurmctld not running) during that time period.
 -- sched/wiki2 - Insure that Moab gets current CPU load information.
 -- Prevent infinite loop in parsing configuration if including file containing
    one blank line.
 -- Fix pack and unpack between 2.6 and 2.5.
 -- Fix job state recovery logic in which a job's accounting frequency was
    not set. This would result in a value of 65534 seconds being used (the
    equivalent of NO_VAL in uint16_t), which could result in the job being
    requeued or aborted.
 -- Validate a job's accounting frequency at submission time rather than
    waiting for it's initiation to possibly fail.
 -- Fix CPURunMins if a job is requeued from a failed launch.
 -- Fix in accounting_storage/filetxt to correct start times which sometimes
    could end up before the job started.
 -- Fix issue with potentially referencing past an array in parse_time()
 -- CRAY - fix issue with accelerators on a cray when parsing BASIL 1.3 XML.
 -- Fix issue with a 2.5 slurmstepd locking up when talking to a 2.6 slurmd.
 -- Add argument to priority plugin's priority_p_reconfig function to note
    when the association and QOS used_cpu_run_secs field has been reset.

* Changes in Slurm 2.6.0
========================
 -- Fix it so bluegene and serial systems don't get warnings over new NODEDATA
    enum.
 -- When a job is aborted send a message for any tasks that have completed.
 -- Correction to memory per CPU calculation on system with threads and
    allocating cores or sockets.
 -- Requeue batch job if it's node reboots (used to abort the job).
 -- Enlarge maximum size of srun's hostlist file.
 -- IPMI - Fix first poll to get correct consumed_energy for a step.
 -- Correction to job state recovery logic that could result in assert failure.
 -- Record partial step accounting record if allocated nodes fail abnormally.
 -- Accounting - fix issue where PrivateData=jobs or users could potentially
    show information to users that had no associations on the system.
 -- Make PrivateData in slurmdbd.conf case insensitive.
 -- sacct/sstat - Add format option ConsumedEnergyRaw to print full energy
    values.

* Changes in Slurm 2.6.0rc2
===========================
 -- HDF5 - Fix issue with Ubuntu where HDF5 development headers are
    overwritten by the parallel versions thus making it so we need handle
    both cases.
 -- ACCT_GATHER - handle suspending correctly for polling threads.
 -- Make SLURM_DISTRIBUTION env var hold both types of distribution if
    specified.
 -- Remove hardcoded /usr/local from slurm.spec.
 -- Modify slurmctld locking to improve performance under heavy load with
    very large numbers of batch job submissions or job cancellations.
 -- sstat - Fix issue where if -j wasn't given allow last argument to be checked
    for as the job/step id.
 -- IPMI - fix adjustment on poll when using EnergyIPMICalcAdjustment.

* Changes in Slurm 2.6.0rc1
===========================
 -- Added helper script for launching symmetric and MIC-only MPI tasks within
    SLURM (in contribs/mic/mpirun-mic).
 -- Change maximum delay for state save from 2 secs to 5 secs. Make timeout
    configurable at build time by defining SAVE_MAX_WAIT.
 -- Modify slurmctld data structure locking to interleave read and write
    locks rather than always favor write locks over read locks.
 -- Added sacct format option of "ALL" to print all fields.
 -- Deprecate the SchedulerParameters value of "interval" use "bf_interval"
    instead as documented.
 -- Add acct_gather_profile/hdf5 to profile jobs with hdf5
 -- Added MaxCPUsPerNode partition configuration parameter. This can be
    especially useful to schedule systems with GPUs.
 -- Permit "scontrol reboot_node" for nodes in MAINT reservation.
 -- Added "PriorityFlags" value of "SMALL_RELATIVE_TO_TIME". If set, the job's
    size component will be based upon not the job size alone, but the job's
    size divided by it's time limit.
 -- Added sbatch option "--ignore-pbs" to ignore "#PBS" options in the batch
    script.
 -- Rename slurm_step_ctx_params_t field from "mem_per_cpu" to "pn_min_memory".
    Job step now accepts memory specification in either per-cpu or per-node
    basis.
 -- Add ability to specify host repitition count in the srun hostfile (e.g.
    "host1*2" is equivalent to "host1,host1").

* Changes in Slurm 2.6.0pre3
============================
 -- Add milliseconds to default log message header (both RFC 5424 and ISO 8601
    time formats). Disable milliseconds logging using the configure
    parameter "--disable-log-time-msec". Default time format changes to
    ISO 8601 (without time zone information). Specify "--enable-rfc5424time"
    to restore the time zone information.
 -- Add username (%u) to the filename pattern in the batch script.
 -- Added options for front end nodes of AllowGroups, AllowUsers, DenyGroups,
    and DenyUsers.
 -- Fix sched/backfill logic to initiate jobs with maximum time limit over the
    partition limit, but the minimum time limit permits it to start.
 -- gres/gpu - Fix for gres.conf file with multiple files on a single line
    using a slurm expression (e.g. "File=/dev/nvidia[0-1]").
 -- Replaced ipmi.conf with generic acct_gather.conf file for all acct_gather
    plugins.  For those doing development to use this follow the model set
    forth in the acct_gather_energy_ipmi plugin.
 -- Added more options to update a step's information
 -- Add DebugFlags=ThreadID which will print the thread id of the calling
    thread.
 -- CRAY - Allocate whole node (CPUs) in reservation despite what the
    user requests.  We have found any srun/aprun afterwards will work on a
    subset of resources.

* Changes in Slurm 2.6.0pre2
============================
 -- Do not purge inactive interactive jobs that lack a port to ping (added
    for MR+ operation).
 -- Advanced reservations with hostname and core counts now supports asymetric
    reservations (e.g. specific different core count for each node).
 -- Added slurmctld/dynalloc plugin for MapReduce+ support.
 -- Added "DynAllocPort" configuration parameter.
 -- Added partition paramter of SelectTypeParameters to override system-wide
    value.
 -- Added cr_type to partition_info data structure.
 -- Added allocated memory to node information available (within the existing
    select_nodeinfo field of the node_info_t data structure). Added Allocated
    Memory to node information displayed by sview and scontrol commands.
 -- Make sched/backfill the default scheduling plugin rather than sched/builtin
    (FIFO).
 -- Added support for a job having different priorities in different partitions.
 -- Added new SchedulerParameters configuration parameter of "bf_continue"
    which permits the backfill scheduler to continue considering jobs for
    backfill scheduling after yielding locks even if new jobs have been
    submitted. This can result in lower priority jobs from being backfill
    scheduled instead of newly arrived higher priority jobs, but will permit
    more queued jobs to be considered for backfill scheduling.
 -- Added support to purge reservation records from accounting.
 -- Cray - Add support for Basil 1.3

* Changes in SLURM 2.6.0pre1
============================
 -- Add "state" field to job step information reported by scontrol.
 -- Notify srun to retry step creation upon completion of other job steps
    rather than polling. This results in much faster throughput for job step
    execution with --exclusive option.
 -- Added "ResvEpilog" and "ResvProlog" configuration parameters to execute a
    program at the beginning and end of each reservation.
 -- Added "slurm_load_job_user" function. This is a variation of
    "slurm_load_jobs", but accepts a user ID argument, potentially resulting
    in substantial performance improvement for "squeue --user=ID"
 -- Added "slurm_load_node_single" function. This is a variation of
    "slurm_load_nodes", but accepts a node name argument, potentially resulting
    in substantial performance improvement for "sinfo --nodes=NAME".
 -- Added "HealthCheckNodeState" configuration parameter identify node states
    on which HealthCheckProgram should be executed.
 -- Remove sacct --dump --formatted-dump options which were deprecated in
    2.5.
 -- Added support for job arrays (phase 1 of effort). See "man sbatch" option
    -a/--array for details.
 -- Add new AccountStorageEnforce options of 'nojobs' and 'nosteps' which will
    allow the use of accounting features like associations, qos and limits but
    not keep track of jobs or steps in accounting.
 -- Cray - Add new cray.conf parameter of "AlpsEngine" to specify the
    communication protocol to be used for ALPS/BASIL.
 -- select/cons_res plugin: Correction to CPU allocation count logic in for
    cores without hyperthreading.
 -- Added new SelectTypeParameter value of "CR_ALLOCATE_FULL_SOCKET".
 -- Added PriorityFlags value of "TICKET_BASED" and merged priority/multifactor2
    plugin into priority/multifactor plugin.
 -- Add "KeepAliveTime" configuration parameter controlling how long sockets
    used for srun/slurmstepd communications are kept alive after disconnect.
 -- Added SLURM_SUBMIT_HOST to salloc, sbatch and srun job environment.
 -- Added SLURM_ARRAY_TASK_ID to environment of job array.
 -- Added squeue --array/-r option to optimize output for job arrays.
 -- Added "SlurmctldPlugstack" configuration parameter for generic stack of
    slurmctld daemon plugins.
 -- Removed contribs/arrayrun tool. Use native support for job arrays.
 -- Modify default installation locations for RPMs to match "make install":
    _prefix /usr/local
    _slurm_sysconfdir %{_prefix}/etc/slurm
    _mandir %{_prefix}/share/man
    _infodir %{_prefix}/share/info
 -- Add acct_gather_energy/ipmi which works off freeipmi for energy gathering

* Changes in Slurm 2.5.8
========================
 -- Fix for slurmctld segfault on NULL front-end reason field.
 -- Avoid gres step allocation errors when a job shrinks in size due to either
    down nodes or explicit resizing. Generated slurmctld errors of this type:
    "step_test ... gres_bit_alloc is NULL"
 -- Fix bug that would leak memory and over-write the AllowGroups field if on
    "scontrol reconfig" when AllowNodes is manually changed using scontrol.
 -- Get html/man files to install in correct places with rpms.
 -- Remove --program-prefix from spec file since it appears to be added by
    default and appeared to break other things.
 -- Updated the automake min version in autogen.sh to be correct.
 -- Select/cons_res - Correct total CPU count allocated to a job with
    --exclusive and --cpus-per-task options
 -- switch/nrt - Don't allocate network resources unless job step has 2+ nodes.
 -- select/cons_res - Avoid extraneous "oversubscribe" error messages.
 -- Reorder get config logic to avoid deadlock.
 -- Enforce QOS MaxCPUsMin limit when job submission contains no user-specified
    time limit.
 -- EpilogSlurmctld pthread is passed required arguments rather than a pointer
    to the job record, which under some conditions could be purged and result
    in an invalid memory reference.

* Changes in Slurm 2.5.7
========================
 -- Fix for linking to the select/cray plugin to not give warning about
    undefined variable.
 -- Add missing symbols to the xlator.h
 -- Avoid placing pending jobs in AdminHold state due to backfill scheduler
    interactions with advanced reservation.
 -- Accounting - make average by task not cpu.
 -- CRAY - Change logging of transient ALPS errors from error() to debug().
 -- POE - Correct logic to support poe option "-euidevice sn_all" and
    "-euidevice sn_single".
 -- Accounting - Fix minor initialization error.
 -- POE - Correct logic to support srun network instances count with POE.
 -- POE - With the srun --launch-cmd option, report proper task count when
    the --cpus-per-task option is used without the --ntasks option.
 -- POE - Fix logic binding tasks to CPUs.
 -- sview - Fix race condition where new information could of slipped past
    the node tab and we didn't notice.
 -- Accounting - Fix an invalid memory read when slurmctld sends data about
    start job to slurmdbd.
 -- If a prolog or epilog failure occurs, drain the node rather than setting it
    down and killing all of its jobs.
 -- Priority/multifactor - Avoid underflow in half-life calculation.
 -- POE - pack missing variable to allow fanout (more than 32 nodes)
 -- Prevent clearing reason field for pending jobs. This bug was introduced in
    v2.5.5 (see "Reject job at submit time ...").
 -- BGQ - Fix issue with preemption on sub-block jobs where a job would kill
    all preemptable jobs on the midplane instead of just the ones it needed to.
 -- switch/nrt - Validate dynamic window allocation size.
 -- BGQ - When --geo is requested do not impose the default conn_types.
 -- CRAY - Support CLE 4.2.0
 -- RebootNode logic - Defers (rather than forgets) reboot request with job
    running on the node within a reservation.
 -- switch/nrt - Correct network_id use logic. Correct support for user sn_all
    and sn_single options.
 -- sched/backfill - Modify logic to reduce overhead under heavy load.
 -- Fix job step allocation with --exclusive and --hostlist option.
 -- Select/cons_res - Fix bug resulting in error of "cons_res: sync loop not
    progressing, holding job #"
 -- checkpoint/blcr - Reset max_nodes from zero to NO_VAL on job restart.
 -- launch/poe - Fix for hostlist file support with repeated host names.
 -- priority/multifactor2 - Prevent possible divide by zero.
 -- srun - Don't check for executable if --test-only flag is used.
 -- energy - On a single node only use the last task for gathering energy.
    Since we don't currently track energy usage per task (only per step).
    Otherwise we get double the energy.

* Changes in Slurm 2.5.6
========================
 -- Gres fix for requeued jobs.
 -- Gres accounting - Fix regression in 2.5.5 for keeping track of gres
    requested and allocated.

* Changes in Slurm 2.5.5
========================
 -- Fix for sacctmgr add qos to handle the 'flags' option.
 -- Export SLURM_ environment variables from sbatch, even if "--export"
    option does not explicitly list them.
 -- If node is in more than one partition, correct counting of allocated CPUs.
 -- If step requests more CPUs than possible in specified node count of job
    allocation then return ESLURM_TOO_MANY_REQUESTED_CPUS rather than
    ESLURM_NODES_BUSY and retrying.
 -- CRAY - Fix SLURM_TASKS_PER_NODE to be set correctly.
 -- Accounting - more checks for strings with a possible `'` in it.
 -- sreport - Fix by adding planned down time to utilization reports.
 -- Do not report an error when sstat identifies job steps terminated during
    its execution, but log using debug type message.
 -- Select/cons_res - Permit node removed from job by going down to be returned
    to service and re-used by another job.
 -- Select/cons_res - Tighter packing of job allocations on sockets.
 -- SlurmDBD - fix to allow user root along with the slurm user to register a
    cluster.
 -- Select/cons_res - Fix for support of consecutive node option.
 -- Select/cray - Modify build to enable direct use of libslurm library.
 -- Bug fixes related to job step allocation logic.
 -- Cray - Disable enforcement of MaxTasksPerNode, which is not applicable
    with launch/aprun.
 -- Accounting - When rolling up data from past usage ignore "idle" time from
    a reservation when it has the "Ignore_Jobs" flag set.  Since jobs could run
    outside of the reservation in it's nodes without this you could have
    double time.
 -- Accounting - Minor fix to avoid reuse of variable erroneously.
 -- Reject job at submit time if the node count is invalid. Previously such a
    job submitted to a DOWN partition would be queued.
 -- Purge vestigial job scripts when the slurmd cold starts or slurmstepd
    terminates abnormally.
 -- Add support for FreeBSD.
 -- Add sanity check for NULL cluster names trying to register.
 -- BGQ - Push action 'D' info to scontrol for admins.
 -- Reset a job's reason from PartitionDown when the partition is set up.
 -- BGQ - Handle issue where blocks would have a pending job on them and
    while it was free cnodes would go into software error and kill the job.
 -- BGQ - Fix issue where if for some reason we are freeing a block with
    a pending job on it we don't kill the job.
 -- BGQ - Fix race condition were a job could of been removed from a block
    without it still existing there.  This is extremely rare.
 -- BGQ - Fix for when a step completes in Slurm before the runjob_mux notifies
    the slurmctld there were software errors on some nodes.
 -- BGQ - Fix issue on state recover if block states are not around
    and when reading in state from DB2 we find a block that can't be created.
    You can now do a clean start to rid the bad block.
 -- Modify slurmdbd to retransmit to slurmctld daemon if it is not responding.
 -- BLUEGENE - Fix issue where when doing backfill preemptable jobs were
    never looked at to determine eligibility of backfillable job.
 -- Cray/BlueGene - Disable srun --pty option unless LaunchType=launch/slurm.
 -- CRAY - Fix sanity check for systems with more than 32 cores per node.
 -- CRAY - Remove other objects from MySQL query that are available from
    the XML.
 -- BLUEGENE - Set the geometry of a job when a block is picked and the job
    isn't a sub-block job.
 -- Cray - avoid check of macro versions of CLE for version 5.0.
 -- CRAY - Fix memory issue with reading in the cray.conf file.
 -- CRAY - If hostlist is given with srun make sure the node count is the same
    as the hosts given.
 -- CRAY - If task count specified, but no tasks-per-node, then set the tasks
    per node in the BASIL reservation request.
 -- CRAY - fix issue with --mem option not giving correct amount of memory
    per cpu.
 -- CRAY - Fix if srun --mem is given outside an allocation to set the
    APRUN_DEFAULT_MEMORY env var for aprun.  This scenario will not display
    the option when used with --launch-cmd.
 -- Change sview to use GMutex instead of GStaticMutex
 -- CRAY - set APRUN_DEFAULT_MEMROY instead of CRAY_AUTO_APRUN_OPTIONS
 -- sview - fix issue where if a partition was completely in one state the
    cpu count would be reflected correctly.
 -- BGQ - fix for handling half rack system in STATIC of OVERLAP mode to
    implicitly create full system block.
 -- CRAY - Dynamically create BASIL XML buffer to resize as needed.
 -- Fix checking if QOS limit MaxCPUMinsPJ is set along with DenyOnLimit to
    deny the job instead of holding it.
 -- Make sure on systems that use a different launcher than launch/slurm not
    to attempt to signal tasks on the frontend node.
 -- Cray - when a step is requested count other steps running on nodes in the
    allocation as taking up the entire node instead of just part of the node
    allocated.  And always enforce exclusive on a step request.
 -- Cray - display correct nodelist, node/cpu count on steps.

* Changes in Slurm 2.5.4
========================
 -- Fix bug in PrologSlurmctld use that would block job steps until node
    responds.
 -- CRAY - If a partition has MinNodes=0 and a batch job doesn't request nodes
    put the allocation to 1 instead of 0 which prevents the allocation to
    happen.
 -- Better debug when the database is down and using the --cluster option in
    the user commands.
 -- When asking for job states with sacct, default to 'now' instead of midnight
    of the current day.
 -- Fix for handling a test-only job or immediate job that fails while being
    built.
 -- Comment out all of the logic in the job_submit/defaults plugin. The logic
    is only an example and not meant for actual use.
 -- Eliminate configuration file 4096 character line limitation.
 -- More robust logic for tree message forward
 -- BGQ - When cnodes fail in a timeout fashion correctly look up parent
    midplane.
 -- Correct sinfo "%c" (node's CPU count) output value for Bluegene systems.
 -- Backfill - Responsive improvements for systems with large numbers of jobs
    (>5000) and using the SchedulerParameters option bf_max_job_user.
 -- slurmstepd: ensure that IO redirection openings from/to files correctly
    handle interruption
 -- BGQ - Able to handle when midplanes go into Hardware::SoftwareFailure
 -- GRES - Correct tracking of specific resources used after slurmctld restart.
    Counts would previously go negative as jobs terminate and decrement from
    a base value of zero.
 -- Fix for priority/multifactor2 plugin to not assert when configured with
    --enable-debug.
 -- Select/cons_res - If the job request specified --ntasks-per-socket and the
    allocation using is cores, then pack the tasks onto the sockets up to the
    specified value.
 -- BGQ - If a cnode goes into an 'error' state and the block containing the
    cnode does not have a job running on it do not resume the block.
 -- BGQ - Handle blocks that don't free themselves in a reasonable time better.
 -- BGQ - Fix for signaling steps when allocation ends before step.
 -- Fix for backfill scheduling logic with job preemption; starts more jobs.
 -- xcgroup - remove bugs with EINTR management in write calls
 -- jobacct_gather - fix total values to not always == the max values.
 -- Fix for handling node registration messages from older versions without
    energy data.
 -- BGQ - Allow user to request full dimensional mesh.
 -- sdiag command - Correction to jobs started value reported.
 -- Prevent slurmctld assert when invalid change to reservation with running
    jobs is made.
 -- BGQ - If signal is NODE_FAIL allow forward even if job is completing
    and timeout in the runjob_mux trying to send in this situation.
 -- BGQ - More robust checking for correct node, task, and ntasks-per-node
    options in srun, and push that logic to salloc and sbatch.
 -- GRES topology bug in core selection logic fixed.
 -- Fix to handle init.d script for querying status and not return 1 on
    success.

* Changes in SLURM 2.5.3
========================
 -- Gres/gpu plugin - If no GPUs requested, set CUDA_VISIBLE_DEVICES=NoDevFiles.
    This bug was introduced in 2.5.2 for the case where a GPU count was
    configured, but without device files.
 -- task/affinity plugin - Fix bug in CPU masks for some processors.
 -- Modify sacct command to get format from SACCT_FORMAT environment variable.
 -- BGQ - Changed order of library inclusions and fixed incorrect declaration
    to compile correctly on newer compilers
 -- Fix for not building sview if glib exists on a system but not the gtk libs.
 -- BGQ - Fix for handling a job cleanup on a small block if the job has long
    since left the system.
 -- Fix race condition in job dependency logic which can result in invalid
    memory reference.


* Changes in SLURM 2.5.2
========================
 -- Fix advanced reservation recovery logic when upgrading from version 2.4.
 -- BLUEGENE - fix for QOS/Association node limits.
 -- Add missing "safe" flag from print of AccountStorageEnforce option.
 -- Fix logic to optimize GRES topology with respect to allocated CPUs.
 -- Add job_submit/all_partitions plugin to set a job's default partition
    to ALL available partitions in the cluster.
 -- Modify switch/nrt logic to permit build without libnrt.so library.
 -- Handle srun task launch failure without duplicate error messages or abort.
 -- Fix bug in QoS limits enforcement when slurmctld restarts and user not yet
    added to the QOS list.
 -- Fix issue where sjstat and sjobexitmod was installed in 2 different RPMs.
 -- Fix for job request of multiple partitions in which some partitions lack
    nodes with required features.
 -- Permit a job to use a QOS they do not have access to if an administrator
    manually set the job's QOS (previously the job would be rejected).
 -- Make more variables available to job_submit/lua plugin: slurm.MEM_PER_CPU,
    slurm.NO_VAL, etc.
 -- Fix topology/tree logic when nodes defined in slurm.conf get re-ordered.
 -- In select/cons_res, correct logic to allocate whole sockets to jobs. Work
    by Magnus Jonsson, Umea University.
 -- In select/cons_res, correct logic when job removed from only some nodes.
 -- Avoid apparent kernel bug in 2.6.32 which apparently is solved in
    at least 3.5.0.  This avoids a stack overflow when running jobs on
    more than 120k nodes.
 -- BLUEGENE - If we made a block that isn't runnable because of a overlapping
    block, destroy it correctly.
 -- Switch/nrt - Dynamically load libnrt.so from within the plugin as needed.
    This eliminates the need for libnrt.so on the head node.
 -- BLUEGENE - Fix in reservation logic that could cause abort.

* Changes in SLURM 2.5.1
========================
 -- Correction to hostlist sorting for hostnames that contain two numeric
    components and the first numeric component has various sizes (e.g.
    "rack9blade1" should come before "rack10blade1")
 -- BGQ - Only poll on initialized blocks instead of calling getBlocks on
    each block independently.
 -- Fix of task/affinity plugin logic for Power7 processors having hyper-
    threading disabled (cpu mask has gaps).
 -- Fix of job priority ordering with sched/builtin and priority/multifactor.
    Patch from Chris Read.
 -- CRAY - Fix for setting up the aprun for a large job (+2000 nodes).
 -- Fix for race condition related to compute node boot resulting in node being
    set down with reason of "Node <name> unexpectedly rebooted"
 -- RAPL - Fix for handling errors when opening msr files.
 -- BGQ - Fix for salloc/sbatch to do the correct allocation when asking for
    -N1 -n#.
 -- BGQ - in emulation make it so we can pretend to run large jobs (>64k nodes)
 -- BLUEGENE - Correct method to update conn_type of a job.
 -- BLUEGENE - Fix issue with preemption when needing to preempt multiple jobs
    to make one job run.
 -- Fixed issue where if an srun dies inside of an allocation abnormally it
    would of also killed the allocation.
 -- FRONTEND - fixed issue where if a systems nodes weren't defined in the
    slurm.conf with NodeAddr's signals going to a step could be handled
    incorrectly.
 -- If sched/backfill starts a job with a QOS having NO_RESERVE and not job
    time limit, start it with the partition time limit (or one year if the
    partition has no time limit) rather than NO_VAL (140 year time limit);
 -- Alter hostlist logic to allocate large grid dynamically instead of on
    stack.
 -- Change RPC version checks to support version 2.5 slurmctld with version 2.4
    slurmd daemons.
 -- Correct core reservation logic for use with select/serial plugin.
 -- Exit scontrol command on stdin EOF.
 -- Disable job --exclusive option with select/serial plugin.

* Changes in SLURM 2.5.0
========================
 -- Add DenyOnLimit flag for QOS to deny jobs at submission time if they
    request resources that reach a 'Max' limit.
 -- Permit SlurmUser or operator to change QOS of non-pending jobs (e.g.
    running jobs).
 -- BGQ - move initial poll to beginning of realtime interaction, which will
    also cause it to run if the realtime server ever goes away.

* Changes in SLURM 2.5.0-rc2
============================
 -- Modify sbcast logic to survive slurmd daemon restart while file a
    transmission is in progress.
 -- Add retry logic to munge encode/decode calls. This is needed if the munge
    deamon is under very heavy load (e.g. with 1000 slurmd daemons per compute
    node).
 -- Add launch and acct_gather_energy plugins to RPMs.
 -- Restore support for srun "--mpi=list" option.
 -- CRAY - Introduce step accounting for a Cray.
 -- Modify srun to abandon I/O 60 seconds after the last task ends. Otherwise
    an aborted slurmstepd can cause the srun process to hang indefinitely.
 -- ENERGY - RAPL - alter code to close open files (and only open them once
    where needed)
 -- If the PrologSlurmctld fails, then requeue the job an indefinite number
    of times instead of only one time.

* Changes in SLURM 2.5.0-rc1
============================
 -- Added Prolog and Epilog Guide (web page). Based upon work by Jason Sollom,
    Cray Inc. and used by permission.
 -- Restore gang scheduling functionality. Preemptor was not being scheduled.
    Fix for bugzilla #3.
 -- Add "cpu_load" to node information. Populate CPULOAD in node information
    reported to Moab cluster manager.
 -- Preempt jobs only when insufficient idle resources exist to start job,
    regardless of the node weight.
 -- Added priority/multifactor2 plugin based upon ticket distribution system.
    Work by Janne Blomqvist, Aalto University.
 -- Add SLURM_NODELIST to environment variables available to Prolog and Epilog.
 -- Permit reservations to allow or deny access by account and/or user.
 -- Add ReconfigFlags value of KeepPartState. See "man slurm.conf" for details.
 -- Modify the task/cgroup plugin adding a task_pre_launch_priv function and
    move slurmstepd outside of the step's cgroup. Work by Matthieu Hautreux.
 -- Intel MIC processor support added using gres/mic plugin. BIG thanks to
    Olli-Pekka Lehto, CSC-IT Center for Science Ltd.
 -- Accounting - Change empty jobacctinfo structs to not actually be used
    instead of putting 0's into the database we put NO_VALS and have sacct
    figure out jobacct_gather wasn't used.
 -- Cray - Prevent calling basil_confirm more than once per job using a flag.
 -- Fix bug with topology/tree and job with min-max node count. Now try to
    get max node count rather than minimizing leaf switches used.
 -- Add AccountingStorageEnforce=safe option to provide method to avoid jobs
    launching that wouldn't be able to run to completion because of a
    GrpCPUMins limit.
 -- Add support for RFC 5424 timestamps in logfiles. Disable with configuration
    option of "--disable-rfc5424time". By Janne Blomqvist, Aalto University.
 -- CRAY - Replace srun.pl with launch/aprun plugin to use srun to wrap the
    aprun process instead of a perl script.
 -- srun - Rename --runjob-opts to --launcher-opts to be used on systems other
    than BGQ.
 -- Added new DebugFlags - Energy for AcctGatherEnergy plugins.
 -- start deprecation of sacct --dump --fdump
 -- BGQ - added --verbose=OFF when srun --quiet is used
 -- Added acct_gather_energy/rapl plugin to record power consumption by job.
    Work by Yiannis Georgiou, Martin Perry, et. al., Bull

* Changes in SLURM 2.5.0.pre3
=============================
 -- Add Google search to all web pages.
 -- Add sinfo -T option to print reservation information. Work by Bill Brophy,
    Bull.
 -- Force slurmd exit after 2 minute wait, even if threads are hung.
 -- Change node_req field in struct job_resources from 8 to 32 bits so we can
    run more than 256 jobs per node.
 -- sched/backfill: Improve accuracy of expected job start with respect to
    reservations.
 -- sinfo partition field size will be set the the length of the longest
    partition name by default.
 -- Make it so the parse_time will return a valid 0 if given epoch time and
    set errno == ESLURM_INVALID_TIME_VALUE on error instead.
 -- Correct srun --no-alloc logic when node count exceeds node list or task
    task count is not a multiple of the node count. Work by Hongjia Cao, NUDT.
 -- Completed integration with IBM Parallel Environment including POE and IBM's
    NRT switch library.

* Changes in SLURM 2.5.0.pre2
=============================
 -- When running with multiple slurmd daemons per node, enable specifying a
    range of ports on a single line of the node configuration in slurm.conf.
 -- Add reservation flag of Part_Nodes to allocate all nodes in a partition to
    a reservation and automatically change the reservation when nodes are
    added to or removed from the reservation. Based upon work by
    Bill Brophy, Bull.
 -- Add support for advanced reservation for specific cores rather than whole
    nodes. Current limiations: homogeneous cluster, nodes idle when reservation
    created, and no more than one reservation per node. Code is still under
    development. Work by Alejandro Lucero Palau, et. al, BSC.
 -- Add DebugFlag of Switch to log switch plugin details.
 -- Correct job node_cnt value in job completion plugin when job fails due to
    down node. Previously was too low by one.
 -- Add new srun option --cpu-freq to enable user control over the job's CPU
    frequency and thus it's power consumption. NOTE: cpu frequency is not
    currently preserved for jobs being suspended and later resumed. Work by
    Don Albert, Bull.
 -- Add node configuration information about "boards" and optimize task
    placement on minimum number of boards. Work by Rod Schultz, Bull.

* Changes in SLURM 2.5.0.pre1
=============================
 -- Add new output to "scontrol show configuration" of LicensesUsed. Output is
    "name:used/total"
 -- Changed jobacct_gather plugin infrastructure to be cleaner and easier to
    maintain.
 -- Change license option count separator from "*" to ":" for consistency with
    the gres option (e.g. "--licenses=foo:2 --gres=gpu:2"). The "*" will still
    be accepted, but is no longer documented.
 -- Permit more than 100 jobs to be scheduled per node (new limit is 250
    jobs).
 -- Restructure of srun code to allow outside programs to utilize existing
    logic.

* Changes in SLURM 2.4.6
========================
 -- Correct WillRun authentication logic when issued for non-job owner.
 -- BGQ - fix memory leak
 -- BGQ - Fix to check block for action 'D' if it also has nodes in error.

* Changes in SLURM 2.4.5
========================
 -- Cray - On job kill requeust, send SIGCONT, SIGTERM, wait KillWait and send
    SIGKILL. Previously just sent SIGKILL to tasks.
 -- BGQ - Fix issue when running srun outside of an allocation and only
    specifying the number of tasks and not the number of nodes.
 -- BGQ - validate correct ntasks_per_node
 -- BGQ - when srun -Q is given make runjob be quiet
 -- Modify use of OOM (out of memory protection) for Linux 2.6.36 kernel
    or later. NOTE: If you were setting the environment variable
    SLURMSTEPD_OOM_ADJ=-17, it should be set to -1000 for Linux 2.6.36 kernel
    or later.
 -- BGQ - Fix job step timeout actually happen when done from within an
    allocation.
 -- Reset node MAINT state flag when a reservation's nodes or flags change.
 -- Accounting - Fix issue where QOS usage was being zeroed out on a
    slurmctld restart.
 -- BGQ - Add 64 tasks per node as a valid option for srun when used with
    overcommit.
 -- BLUEGENE - With Dynamic layout mode - Fix issue where if a larger block
    was already in error and isn't deallocating and underlying hardware goes
    bad one could get overlapping blocks in error making the code assert when
    a new job request comes in.
 -- BGQ - handle pending actions on a block better when trying to deallocate it.
 -- Accounting - Fixed issue where if nodenames have changed on a system and
    you query against that with -N and -E you will get all jobs during that
    time instead of only the ones running on -N.
 -- BGP - Fix for HTC mode
 -- Accounting - If a job start message fails to the SlurmDBD reset the db_inx
    so it gets sent again.  This isn't a major problem since the start will
    happen when the job ends, but this does make things cleaner.
 -- If an salloc is waiting for an allocation to happen and is canceled by the
    user mark the state canceled instead of completed.
 -- Fix issue in accounting if a user puts a '\' in their job name.
 -- Accounting - Fix for if asking for users or accounts that were deleted
    with associations get the deleted associations as well.
 -- BGQ - Handle shared blocks that need to be removed and have jobs running
    on them.  This should only happen in extreme conditions.
 -- Fix inconsistency for hostlists that have more than 1 range.
 -- BGQ - Add mutex around recovery for the Real Time server to avoid hitting
    DB2 so hard.
 -- BGQ - If an allocation exists on a block that has a 'D' action on it fail
    job on future step creation attempts.

* Changes in SLURM 2.4.4
========================
 -- BGQ - minor fix to make build work in emulated mode.
 -- BGQ - Fix if large block goes into error and the next highest priority jobs
    are planning on using the block.  Previously it would fail those jobs
    erroneously.
 -- BGQ - Fix issue when a cnode going to an error (not SoftwareError) state
    with a job running or trying to run on it.
 -- Execute slurm_spank_job_epilog when there is no system Epilog configured.
 -- Fix for srun --test-only to work correctly with timelimits
 -- BGQ - If a job goes away while still trying to free it up in the
    database, and the job is running on a small block make sure we free up
    the correct node count.
 -- BGQ - Logic added to make sure a job has finished on a block before it is
    purged from the system if its front-end node goes down.
 -- Modify strigger so that a filter option of "--user=0" is supported.
 -- Correct --mem-per-cpu logic for core or socket allocations with multiple
    threads per core.
 -- Fix for older < glibc 2.4 systems to use euidaccess() instead of eaccess().
 -- BLUEGENE - Do not alter a pending job's node count when changing it's
    partition.
 -- BGQ - Add functionality to make it so we track the actions on a block.
    This is needed for when a free request is added to a block but there are
    jobs finishing up so we don't start new jobs on the block since they will
    fail on start.
 -- BGQ - Fixed InactiveLimit to work correctly to avoid scenarios where a
    user's pending allocation was started with srun and then for some reason
    the slurmctld was brought down and while it was down the srun was removed.
 -- Fixed InactiveLimit math to work correctly
 -- BGQ - Add logic to make it so blocks can't use a midplane with a nodeboard
    in error for passthrough.
 -- BGQ - Make it so if a nodeboard goes in error any block using that midplane
    for passthrough gets removed on a dynamic system.
 -- BGQ - Fix for printing realtime server debug correctly.
 -- BGQ - Cleaner handling of cnode failures when reported through the runjob
    interface instead of through the normal method.
 -- smap - spread node information across multiple lines for larger systems.
 -- Cray - Defer salloc until after PrologSlurmctld completes.
 -- Correction to slurmdbd communications failure handling logic, incorrect
    error codes returned in some cases.

* Changes in SLURM 2.4.3
========================
 -- Accounting - Fix so complete 32 bit numbers can be put in for a priority.
 -- cgroups - fix if initial directory is non-existent SLURM creates it
    correctly.  Before the errno wasn't being checked correctly
 -- BGQ - fixed srun when only requesting a task count and not a node count
    to operate the same way salloc or sbatch did and assign a task per cpu
    by default instead of task per node.
 -- Fix salloc --gid to work correctly.  Reported by Brian Gilmer
 -- BGQ - fix smap to set the correct default MloaderImage
 -- BLUEGENE - updated documentation.
 -- Close the batch job's environment file when it contains no data to avoid
    leaking file descriptors.
 -- Fix sbcast's credential to last till the end of a job instead of the
    previous 20 minute time limit.  The previous behavior would fail for
    large files 20 minutes into the transfer.
 -- Return ESLURM_NODES_BUSY rather than ESLURM_NODE_NOT_AVAIL error on job
    submit when required nodes are up, but completing a job or in exclusive
    job allocation.
 -- Add HWLOC_FLAGS so linking to libslurm works correctly
 -- BGQ - If using backfill and a shared block is running at least one job
    and a job comes through backfill and can fit on the block without ending
    jobs don't set an end_time for the running jobs since they don't need to
    end to start the job.
 -- Initialize bind_verbose when using task/cgroup.
 -- BGQ - Fix for handling backfill much better when sharing blocks.
 -- BGQ - Fix for making small blocks on first pass if not sharing blocks.
 -- BLUEGENE - Remove force of default conn_type instead of leaving NAV
    when none are requested.  The Block allocator sets it up temporarily so
    this isn't needed.
 -- BLUEGENE - Fix deadlock issue when dealing with bad hardware if using
    static blocks.
 -- Fix to mysql plugin during rollup to only query suspended table when jobs
    reported some suspended time.
 -- Fix compile with glibc 2.16 (Kacper Kowalik)
 -- BGQ - fix for deadlock where a block has error on it and all jobs
    running on it are preemptable by scheduling job.
 -- proctrack/cgroup: Exclude internal threads from "scontrol list pids".
    Patch from Matthieu Hautreux, CEA.
 -- Memory leak fixed for select/linear when preempting jobs.
 -- Fix if updating begin time of a job to update the eligible time in
    accounting as well.
 -- BGQ - make it so you can signal steps when signaling the job allocation.
 -- BGQ - Remove extra overhead if a large block has many cnode failures.
 -- Priority/Multifactor - Fix issue with age factor when a job is estimated to
    start in the future but is able to run now.
 -- CRAY - update to work with ALPS 5.1
 -- BGQ - Handle issue of speed and mutexes when polling instead of using the
    realtime server.
 -- BGQ - Fix minor sorting issue with sview when sorting by midplanes.
 -- Accounting - Fix for handling per user max node/cpus limits on a QOS
    correctly for current job.
 -- Update documentation for -/+= when updating a reservation's
    users/accounts/flags
 -- Update pam module to work if using aliases on nodes instead of actual
    host names.
 -- Correction to task layout logic in select/cons_res for job with minimum
    and maximum node count.
 -- BGQ - Put final poll after realtime comes back into service to avoid
    having the realtime server go down over and over again while waiting
    for the poll to finish.
 -- task/cgroup/memory - ensure that ConstrainSwapSpace=no is correctly
    handled. Work by Matthieu Hautreux, CEA.
 -- CRAY - Fix for sacct -N option to work correctly
 -- CRAY - Update documentation to describe installation from rpm instead
    or previous piecemeal method.
 -- Fix sacct to work with QOS' that have previously been deleted.
 -- Added all available limits to the output of sacctmgr list qos

* Changes in SLURM 2.4.2
========================
 -- BLUEGENE - Correct potential deadlock issue when hardware goes bad and
    there are jobs running on that hardware.
 -- If job is submitted to more than one partition, it's partition pointer can
    be set to an invalid value. This can result in the count of CPUs allocated
    on a node being bad, resulting in over- or under-allocation of its CPUs.
    Patch by Carles Fenoy, BSC.
 -- Fix bug in task layout with select/cons_res plugin and --ntasks-per-node
    option. Patch by Martin Perry, Bull.
 -- BLUEGENE - remove race condition where if a block is removed while waiting
    for a job to finish on it the number of unused cpus wasn't updated
    correctly.
 -- BGQ - make sure we have a valid block when creating or finishing a step
    allocation.
 -- BLUEGENE - If a large block (> 1 midplane) is in error and underlying
    hardware is marked bad remove the larger block and create a block over
    just the bad hardware making the other hardware available to run on.
 -- BLUEGENE - Handle job completion correctly if an admin removes a block
    where other blocks on an overlapping midplane are running jobs.
 -- BLUEGENE - correctly remove running jobs when freeing a block.
 -- BGQ - correct logic to place multiple (< 1 midplane) steps inside a
    multi midplane block allocation.
 -- BGQ - Make it possible for a multi midplane allocation to run on more
    than 1 midplane but not the entire allocation.
 -- BGL - Fix for syncing users on block from Tim Wickberg
 -- Fix initialization of protocol_version for some messages to make sure it
    is always set when sending or receiving a message.
 -- Reset backfilled job counter only when explicitly cleared using scontrol.
    Patch from Alejandro Lucero Palau, BSC.
 -- BLUEGENE - Fix for handling blocks when a larger block will not free and
    while it is attempting to free underlying hardware is marked in error
    making small blocks overlapping with the freeing block.  This only
    applies to dynamic layout mode.
 -- Cray and BlueGene - Do not treat lack of usable front-end nodes when
    slurmctld deamon starts as a fatal error. Also preserve correct front-end
    node for jobs when there is more than one front-end node and the slurmctld
    daemon restarts.
 -- Correct parsing of srun/sbatch input/output/error file names so that only
    the name "none" is mapped to /dev/null and not any file name starting
    with "none" (e.g. "none.o").
 -- BGQ - added version string to the load of the runjob_mux plugin to verify
    the current plugin has been loaded when using runjob_mux_refresh_config
 -- CGROUPS - Use system mount/umount function calls instead of doing fork
    exec of mount/umount from Janne Blomqvist.
 -- BLUEGENE - correct start time setup when no jobs are blocking the way
    from Mark Nelson
 -- Fixed sacct --state=S query to return information about suspended jobs
    current or in the past.
 -- FRONTEND - Made error warning more apparent if a frontend node isn't
    configured correctly.
 -- BGQ - update documentation about runjob_mux_refresh_config which works
    correctly as of IBM driver V1R1M1 efix 008.

21 files changed, 248 insertions, 50 deletions

diff --git a/parallel/slurm/Makefile b/parallel/slurm/Makefile
index 74cb6b466ae..8557c0ed62f 100644
--- a/parallel/slurm/Makefile
+++ b/parallel/slurm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/07/12 10:45:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2013/12/06 06:05:30 asau Exp $
 
-DISTNAME=	slurm-2.4.1
-PKGREVISION=	4
+DISTNAME=	slurm-2.6.4
 CATEGORIES=	parallel
 MASTER_SITES=	http://www.schedmd.com/download/archive/ \
 		http://www.schedmd.com/download/latest/ \
@@ -18,6 +17,7 @@ GNU_CONFIGURE=	yes
 USE_TOOLS=	perl pkg-config
 USE_LIBTOOL=	yes
 
+CONFIGURE_ARGS+=	--with-hdf5=no
 # Fix installation:
 CONFIGURE_ARGS+=	--htmldir=$(PREFIX)/share/doc/$(PKGNAME_NOREV)/html
 
diff --git a/parallel/slurm/PLIST b/parallel/slurm/PLIST
index 47ea3247cb6..fa100c6cf33 100644
--- a/parallel/slurm/PLIST
+++ b/parallel/slurm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/07/03 22:00:41 asau Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/12/06 06:05:30 asau Exp $
 bin/sacct
 bin/sacctmgr
 bin/salloc
@@ -28,18 +28,29 @@ lib/libslurmdb.la
 lib/slurm/accounting_storage_filetxt.la
 lib/slurm/accounting_storage_none.la
 lib/slurm/accounting_storage_slurmdbd.la
+lib/slurm/acct_gather_energy_none.la
+lib/slurm/acct_gather_energy_rapl.la
+lib/slurm/acct_gather_filesystem_lustre.la
+lib/slurm/acct_gather_filesystem_none.la
+lib/slurm/acct_gather_infiniband_none.la
+lib/slurm/acct_gather_profile_none.la
 lib/slurm/auth_munge.la
 lib/slurm/auth_none.la
 lib/slurm/checkpoint_none.la
 lib/slurm/checkpoint_ompi.la
 lib/slurm/crypto_munge.la
 lib/slurm/crypto_openssl.la
+lib/slurm/ext_sensors_none.la
 lib/slurm/gres_gpu.la
+lib/slurm/gres_mic.la
 lib/slurm/gres_nic.la
+lib/slurm/job_submit_all_partitions.la
 lib/slurm/job_submit_cnode.la
 lib/slurm/job_submit_defaults.la
 lib/slurm/job_submit_logging.la
 lib/slurm/job_submit_partition.la
+lib/slurm/job_submit_pbs.la
+lib/slurm/job_submit_require_timelimit.la
 lib/slurm/jobacct_gather_aix.la
 lib/slurm/jobacct_gather_cgroup.la
 lib/slurm/jobacct_gather_linux.la
@@ -47,6 +58,7 @@ lib/slurm/jobacct_gather_none.la
 lib/slurm/jobcomp_filetxt.la
 lib/slurm/jobcomp_none.la
 lib/slurm/jobcomp_script.la
+lib/slurm/launch_slurm.la
 lib/slurm/mpi_lam.la
 lib/slurm/mpi_mpich1_p4.la
 lib/slurm/mpi_mpich1_shmem.la
@@ -72,6 +84,8 @@ lib/slurm/sched_wiki2.la
 lib/slurm/select_cons_res.la
 lib/slurm/select_cray.la
 lib/slurm/select_linear.la
+lib/slurm/select_serial.la
+lib/slurm/spank_pbs.la
 lib/slurm/src/sattach/sattach.wrapper.c
 lib/slurm/src/srun/srun.wrapper.c
 lib/slurm/switch_none.la
@@ -90,6 +104,7 @@ man/man1/sbcast.1
 man/man1/scancel.1
 man/man1/scontrol.1
 man/man1/sdiag.1
+man/man1/sh5util.1
 man/man1/sinfo.1
 man/man1/slurm.1
 man/man1/smap.1
@@ -155,6 +170,7 @@ man/man3/slurm_hostlist_shift.3
 man/man3/slurm_init_job_desc_msg.3
 man/man3/slurm_init_part_desc_msg.3
 man/man3/slurm_init_resv_desc_msg.3
+man/man3/slurm_init_trigger_msg.3
 man/man3/slurm_init_update_front_end_msg.3
 man/man3/slurm_init_update_node_msg.3
 man/man3/slurm_init_update_step_msg.3
@@ -171,8 +187,10 @@ man/man3/slurm_kill_job_step.3
 man/man3/slurm_load_ctl_conf.3
 man/man3/slurm_load_front_end.3
 man/man3/slurm_load_job.3
+man/man3/slurm_load_job_user.3
 man/man3/slurm_load_jobs.3
 man/man3/slurm_load_node.3
+man/man3/slurm_load_node_single.3
 man/man3/slurm_load_partitions.3
 man/man3/slurm_load_reservations.3
 man/man3/slurm_load_slurmd_status.3
@@ -233,9 +251,11 @@ man/man3/slurm_update_node.3
 man/man3/slurm_update_partition.3
 man/man3/slurm_update_reservation.3
 man/man3/slurm_update_step.3
+man/man5/acct_gather.conf.5
 man/man5/bluegene.conf.5
 man/man5/cgroup.conf.5
 man/man5/cray.conf.5
+man/man5/ext_sensors.conf.5
 man/man5/gres.conf.5
 man/man5/slurm.conf.5
 man/man5/slurmdbd.conf.5
@@ -250,8 +270,13 @@ sbin/slurmctld
 sbin/slurmd
 sbin/slurmdbd
 sbin/slurmstepd
+share/doc/${PKGNAME}/html/Slurm_Entity.pdf
+share/doc/${PKGNAME}/html/Slurm_Individual.pdf
 share/doc/${PKGNAME}/html/accounting.html
 share/doc/${PKGNAME}/html/accounting_storageplugins.html
+share/doc/${PKGNAME}/html/acct_gather_energy_plugins.html
+share/doc/${PKGNAME}/html/acct_gather_profile_plugins.html
+share/doc/${PKGNAME}/html/add.html
 share/doc/${PKGNAME}/html/allocation_pies.gif
 share/doc/${PKGNAME}/html/api.html
 share/doc/${PKGNAME}/html/arch.gif
@@ -267,6 +292,7 @@ share/doc/${PKGNAME}/html/configurator.easy.html
 share/doc/${PKGNAME}/html/configurator.html
 share/doc/${PKGNAME}/html/cons_res.html
 share/doc/${PKGNAME}/html/cons_res_share.html
+share/doc/${PKGNAME}/html/contributor.html
 share/doc/${PKGNAME}/html/cpu_management.html
 share/doc/${PKGNAME}/html/cray.html
 share/doc/${PKGNAME}/html/crypto_plugins.html
@@ -274,22 +300,32 @@ share/doc/${PKGNAME}/html/disclaimer.html
 share/doc/${PKGNAME}/html/dist_plane.html
 share/doc/${PKGNAME}/html/documentation.html
 share/doc/${PKGNAME}/html/download.html
+share/doc/${PKGNAME}/html/dynalloc.html
 share/doc/${PKGNAME}/html/elastic_computing.html
 share/doc/${PKGNAME}/html/entities.gif
 share/doc/${PKGNAME}/html/example_usage.gif
+share/doc/${PKGNAME}/html/ext_sensorsplugins.html
 share/doc/${PKGNAME}/html/faq.html
 share/doc/${PKGNAME}/html/gang_scheduling.html
 share/doc/${PKGNAME}/html/gres.html
 share/doc/${PKGNAME}/html/gres_design.html
 share/doc/${PKGNAME}/html/gres_plugins.html
+share/doc/${PKGNAME}/html/hdf5_job_outline.png
+share/doc/${PKGNAME}/html/hdf5_profile_user_guide.html
+share/doc/${PKGNAME}/html/hdf5_task_attr.png
 share/doc/${PKGNAME}/html/help.html
 share/doc/${PKGNAME}/html/high_throughput.html
+share/doc/${PKGNAME}/html/ibm-pe.html
 share/doc/${PKGNAME}/html/ibm.html
+share/doc/${PKGNAME}/html/ibm_pe_fig1.png
+share/doc/${PKGNAME}/html/ibm_pe_fig2.png
+share/doc/${PKGNAME}/html/job_array.html
 share/doc/${PKGNAME}/html/job_exit_code.html
 share/doc/${PKGNAME}/html/job_launch.html
 share/doc/${PKGNAME}/html/job_submit_plugins.html
 share/doc/${PKGNAME}/html/jobacct_gatherplugins.html
 share/doc/${PKGNAME}/html/jobcompplugins.html
+share/doc/${PKGNAME}/html/launch_plugins.html
 share/doc/${PKGNAME}/html/linuxstyles.css
 share/doc/${PKGNAME}/html/lll.gif
 share/doc/${PKGNAME}/html/mail.html
@@ -317,24 +353,29 @@ share/doc/${PKGNAME}/html/power_save.html
 share/doc/${PKGNAME}/html/preempt.html
 share/doc/${PKGNAME}/html/preemption_plugins.html
 share/doc/${PKGNAME}/html/priority_multifactor.html
+share/doc/${PKGNAME}/html/priority_multifactor2.html
 share/doc/${PKGNAME}/html/priority_plugins.html
 share/doc/${PKGNAME}/html/proctrack_plugins.html
 share/doc/${PKGNAME}/html/programmer_guide.html
+share/doc/${PKGNAME}/html/prolog_epilog.html
 share/doc/${PKGNAME}/html/publications.html
 share/doc/${PKGNAME}/html/qos.html
 share/doc/${PKGNAME}/html/quickstart.html
 share/doc/${PKGNAME}/html/quickstart_admin.html
 share/doc/${PKGNAME}/html/reservations.html
 share/doc/${PKGNAME}/html/resource_limits.html
+share/doc/${PKGNAME}/html/rosetta.html
+share/doc/${PKGNAME}/html/schedmd.png
 share/doc/${PKGNAME}/html/schedplugins.html
 share/doc/${PKGNAME}/html/select_design.html
 share/doc/${PKGNAME}/html/selectplugins.html
 share/doc/${PKGNAME}/html/slurm.html
-share/doc/${PKGNAME}/html/slurm_banner.gif
 share/doc/${PKGNAME}/html/slurm_design.pdf
+share/doc/${PKGNAME}/html/slurm_logo.png
 share/doc/${PKGNAME}/html/slurm_ug_agenda.html
 share/doc/${PKGNAME}/html/slurm_ug_cfp.html
 share/doc/${PKGNAME}/html/slurm_ug_registration.html
+share/doc/${PKGNAME}/html/slurmctld_plugstack.html
 share/doc/${PKGNAME}/html/slurmstyles.css
 share/doc/${PKGNAME}/html/sponsors.gif
 share/doc/${PKGNAME}/html/sun_const.html
@@ -347,15 +388,17 @@ share/doc/${PKGNAME}/html/topo_ex2.gif
 share/doc/${PKGNAME}/html/topology.html
 share/doc/${PKGNAME}/html/topology_plugin.html
 share/doc/${PKGNAME}/html/troubleshoot.html
+share/doc/${PKGNAME}/html/tutorial_intro_files.tar
+share/doc/${PKGNAME}/html/tutorials.html
 share/doc/${PKGNAME}/html/usage_pies.gif
 share/examples/slurm/bluegene.conf.example
 share/examples/slurm/cgroup.conf.example
 share/examples/slurm/cgroup.release_common.example
 share/examples/slurm/cgroup_allowed_devices_file.conf.example
-share/examples/slurm/federation.conf.example
 share/examples/slurm/init.d.slurm
+share/examples/slurm/init.d.slurm.in
 share/examples/slurm/init.d.slurmdbd
+share/examples/slurm/init.d.slurmdbd.in
 share/examples/slurm/slurm.conf.example
 share/examples/slurm/slurm.epilog.clean
 share/examples/slurm/slurmdbd.conf.example
-@pkgdir libexec/slurm
diff --git a/parallel/slurm/distinfo b/parallel/slurm/distinfo
index f03c7343cfd..7fa25bad19a 100644
--- a/parallel/slurm/distinfo
+++ b/parallel/slurm/distinfo
@@ -1,13 +1,23 @@
-$NetBSD: distinfo,v 1.2 2012/07/03 22:00:41 asau Exp $
+$NetBSD: distinfo,v 1.3 2013/12/06 06:05:30 asau Exp $
 
-SHA1 (slurm-2.4.1.tar.bz2) = 76b1eccad48d74ad9254d79d1252f3097e719f57
-RMD160 (slurm-2.4.1.tar.bz2) = 82b15dc29dc4297cb62298650f10881694b6e224
-Size (slurm-2.4.1.tar.bz2) = 5212382 bytes
-SHA1 (patch-doc_html_Makefile.am) = 92a1942ed7c532fee6597f4d8a3adf81352f6d98
-SHA1 (patch-doc_html_Makefile.in) = 65f05532ae7701c8d33fd46b7c5f853c9bd6a1b0
-SHA1 (patch-doc_man_man1_Makefile.am) = c21d927d0d4949d1b82c57e865ee7a79ed8b99ed
-SHA1 (patch-doc_man_man1_Makefile.in) = 9c568214983defe06627c701e96267f568597d50
-SHA1 (patch-doc_man_man5_Makefile.am) = b8473964ad03e95c8416fe623e198f50dd557a08
-SHA1 (patch-doc_man_man5_Makefile.in) = c1ea74633a8c59eaa6aaca3041c48770d7705432
-SHA1 (patch-doc_man_man8_Makefile.am) = 46fb6837dc31e6f7ca926ffff1ddda1bdefeb83a
-SHA1 (patch-doc_man_man8_Makefile.in) = e7c66557680c550f1d87147dad4107ad00c4c713
+SHA1 (slurm-2.6.4.tar.bz2) = 6a5850b53201d506a86ab23d13318be34395d237
+RMD160 (slurm-2.6.4.tar.bz2) = a6b4ab6782b0db0822acb2fd7efe6c1464b8a87c
+Size (slurm-2.6.4.tar.bz2) = 5954130 bytes
+SHA1 (patch-doc_html_Makefile.am) = 9152b1c6d735fbd106a5b2841b09b0c0d5fdbf9e
+SHA1 (patch-doc_html_Makefile.in) = 237da04742791877d42d4b68805b2a513aab8f40
+SHA1 (patch-doc_man_man1_Makefile.am) = a131bb9ac16f2683dd0756fff4538a3213043503
+SHA1 (patch-doc_man_man1_Makefile.in) = 262ea869552b7ebd44b63e3df11a40b7172d2425
+SHA1 (patch-doc_man_man5_Makefile.am) = b6918b7bf767b203841c8450bb6ab05b3339b08c
+SHA1 (patch-doc_man_man5_Makefile.in) = 6a6d6370c915041096a8b1784dc290f76cac6f1b
+SHA1 (patch-doc_man_man8_Makefile.am) = 1a5e7a1139688b0ce127a020deab04402599485e
+SHA1 (patch-doc_man_man8_Makefile.in) = 01efd7282aa9d1d011c283358cb4aa566f7c72d6
+SHA1 (patch-src_common_net.c) = 6a53ef7ef94afa1e48d929c635e900c9999e381b
+SHA1 (patch-src_common_slurm__jobacct__gather.c) = abcb7c117c3efa95509d047ff7243fc98cfc00b7
+SHA1 (patch-src_common_xcgroup.c) = fd49ee490fc663635b0b5a3ce54ede7e6166b897
+SHA1 (patch-src_common_xcgroup.h) = 78e9021a725692c8a980556c000c4501c8009a75
+SHA1 (patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c) = 3544b07d4266476b2038a39a91166a6a1c802e18
+SHA1 (patch-src_slurmctld_reservation.c) = c02eb31c2b9dee32e1b68bb9ecf63acd34a987ca
+SHA1 (patch-src_slurmd_common_setproctitle.c) = 1ac0cccd1f889a8a3e3d998bdb6392cfbca932e5
+SHA1 (patch-src_slurmd_slurmstepd_task.c) = b7afd7c2ed58b8423490e1117d6e82d7b0f3294b
+SHA1 (patch-src_srun_libsrun_debugger.c) = 1d10d883c2f9931af3166980c70730ab9fa1df96
+SHA1 (patch-src_srun_libsrun_launch.c) = ff3cbfced383206f86f33c3a511334b95da9edc7
diff --git a/parallel/slurm/patches/patch-doc_html_Makefile.am b/parallel/slurm/patches/patch-doc_html_Makefile.am
index bd7b06853dc..dfd6b0289d3 100644
--- a/parallel/slurm/patches/patch-doc_html_Makefile.am
+++ b/parallel/slurm/patches/patch-doc_html_Makefile.am
@@ -1,10 +1,10 @@
-$NetBSD: patch-doc_html_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
+$NetBSD: patch-doc_html_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $
 
---- doc/html/Makefile.am.orig	2012-03-16 22:14:30.000000000 +0000
+--- doc/html/Makefile.am.orig	2013-11-04 21:19:15.000000000 +0000
 +++ doc/html/Makefile.am
 @@ -1,6 +1,3 @@
 -
--htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
+-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
 -
  generated_html = \
  	accounting.html \
diff --git a/parallel/slurm/patches/patch-doc_html_Makefile.in b/parallel/slurm/patches/patch-doc_html_Makefile.in
index e844bff255f..335e9e1c73f 100644
--- a/parallel/slurm/patches/patch-doc_html_Makefile.in
+++ b/parallel/slurm/patches/patch-doc_html_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-doc_html_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
+$NetBSD: patch-doc_html_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $
 
---- doc/html/Makefile.in.orig	2012-03-16 22:14:30.000000000 +0000
+--- doc/html/Makefile.in.orig	2013-11-04 21:19:15.000000000 +0000
 +++ doc/html/Makefile.in
-@@ -282,7 +282,7 @@ host_alias = @host_alias@
+@@ -341,7 +341,7 @@ host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
--htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
+-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
 +htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
diff --git a/parallel/slurm/patches/patch-doc_man_man1_Makefile.am b/parallel/slurm/patches/patch-doc_man_man1_Makefile.am
index edd368c0351..ce9d18c54bd 100644
--- a/parallel/slurm/patches/patch-doc_man_man1_Makefile.am
+++ b/parallel/slurm/patches/patch-doc_man_man1_Makefile.am
@@ -1,9 +1,9 @@
-$NetBSD: patch-doc_man_man1_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
+$NetBSD: patch-doc_man_man1_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $
 
---- doc/man/man1/Makefile.am.orig	2012-03-16 22:14:30.000000000 +0000
+--- doc/man/man1/Makefile.am.orig	2013-11-04 21:19:15.000000000 +0000
 +++ doc/man/man1/Makefile.am
 @@ -1,5 +1,3 @@
--htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
+-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
 -
  man1_MANS = \
  	sacct.1 \
diff --git a/parallel/slurm/patches/patch-doc_man_man1_Makefile.in b/parallel/slurm/patches/patch-doc_man_man1_Makefile.in
index 7d03ad960b2..32a542af2bf 100644
--- a/parallel/slurm/patches/patch-doc_man_man1_Makefile.in
+++ b/parallel/slurm/patches/patch-doc_man_man1_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-doc_man_man1_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
+$NetBSD: patch-doc_man_man1_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $
 
---- doc/man/man1/Makefile.in.orig	2012-03-16 22:14:30.000000000 +0000
+--- doc/man/man1/Makefile.in.orig	2013-11-04 21:19:15.000000000 +0000
 +++ doc/man/man1/Makefile.in
-@@ -284,7 +284,7 @@ host_alias = @host_alias@
+@@ -343,7 +343,7 @@ host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
--htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
+-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
 +htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
diff --git a/parallel/slurm/patches/patch-doc_man_man5_Makefile.am b/parallel/slurm/patches/patch-doc_man_man5_Makefile.am
index b6a4256accd..e09c0aa9648 100644
--- a/parallel/slurm/patches/patch-doc_man_man5_Makefile.am
+++ b/parallel/slurm/patches/patch-doc_man_man5_Makefile.am
@@ -1,10 +1,10 @@
-$NetBSD: patch-doc_man_man5_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
+$NetBSD: patch-doc_man_man5_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $
 
---- doc/man/man5/Makefile.am.orig	2012-03-16 22:14:30.000000000 +0000
+--- doc/man/man5/Makefile.am.orig	2013-11-04 21:19:15.000000000 +0000
 +++ doc/man/man5/Makefile.am
 @@ -1,5 +1,3 @@
--htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
+-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
 -
- man5_MANS = bluegene.conf.5 \
- 	cgroup.conf.5 \
- 	cray.conf.5 \
+ man5_MANS = \
+ 	acct_gather.conf.5 \
+ 	bluegene.conf.5 \
diff --git a/parallel/slurm/patches/patch-doc_man_man5_Makefile.in b/parallel/slurm/patches/patch-doc_man_man5_Makefile.in
index fc40b1b9956..32cc2885c37 100644
--- a/parallel/slurm/patches/patch-doc_man_man5_Makefile.in
+++ b/parallel/slurm/patches/patch-doc_man_man5_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-doc_man_man5_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
+$NetBSD: patch-doc_man_man5_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $
 
---- doc/man/man5/Makefile.in.orig	2012-03-16 22:14:30.000000000 +0000
+--- doc/man/man5/Makefile.in.orig	2013-11-04 21:19:15.000000000 +0000
 +++ doc/man/man5/Makefile.in
-@@ -284,7 +284,7 @@ host_alias = @host_alias@
+@@ -343,7 +343,7 @@ host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
--htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
+-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
 +htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
diff --git a/parallel/slurm/patches/patch-doc_man_man8_Makefile.am b/parallel/slurm/patches/patch-doc_man_man8_Makefile.am
index dab3450da31..c7547823cc6 100644
--- a/parallel/slurm/patches/patch-doc_man_man8_Makefile.am
+++ b/parallel/slurm/patches/patch-doc_man_man8_Makefile.am
@@ -1,9 +1,9 @@
-$NetBSD: patch-doc_man_man8_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
+$NetBSD: patch-doc_man_man8_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $
 
---- doc/man/man8/Makefile.am.orig	2012-03-16 22:14:30.000000000 +0000
+--- doc/man/man8/Makefile.am.orig	2013-11-04 21:19:15.000000000 +0000
 +++ doc/man/man8/Makefile.am
 @@ -1,5 +1,3 @@
--htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
+-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
 -
  man8_MANS = slurmctld.8 \
  	slurmd.8 \
diff --git a/parallel/slurm/patches/patch-doc_man_man8_Makefile.in b/parallel/slurm/patches/patch-doc_man_man8_Makefile.in
index b21bf6a438b..216ce67f93f 100644
--- a/parallel/slurm/patches/patch-doc_man_man8_Makefile.in
+++ b/parallel/slurm/patches/patch-doc_man_man8_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-doc_man_man8_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $
+$NetBSD: patch-doc_man_man8_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $
 
---- doc/man/man8/Makefile.in.orig	2012-03-16 22:14:30.000000000 +0000
+--- doc/man/man8/Makefile.in.orig	2013-11-04 21:19:15.000000000 +0000
 +++ doc/man/man8/Makefile.in
-@@ -284,7 +284,7 @@ host_alias = @host_alias@
+@@ -343,7 +343,7 @@ host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
--htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html
+-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html
 +htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
diff --git a/parallel/slurm/patches/patch-src_common_net.c b/parallel/slurm/patches/patch-src_common_net.c
new file mode 100644
index 00000000000..f473503843b
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_common_net.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_common_net.c,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/common/net.c.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/common/net.c
+@@ -52,7 +52,7 @@
+ #include <errno.h>
+ #include <stdint.h>
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
+ #define	SOL_TCP		IPPROTO_TCP
+ #endif
+ 
+@@ -216,7 +216,7 @@ extern int net_set_keep_alive(int sock)
+  * Removing this call might decrease the robustness of communications,
+  * but will probably have no noticable effect.
+  */
+-#if ! defined(__FreeBSD__) || (__FreeBSD_version > 900000)
++#if (! defined(__FreeBSD__) || (__FreeBSD_version > 900000)) && ! defined(__APPLE__)
+ 	opt_int = keep_alive_time;
+ 	if (setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &opt_int, opt_len) < 0) {
+ 		error("Unable to set keep alive socket time: %m");
diff --git a/parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c b/parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c
new file mode 100644
index 00000000000..68a1a5b3e55
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_common_slurm__jobacct__gather.c,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/common/slurm_jobacct_gather.c.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/common/slurm_jobacct_gather.c
+@@ -47,7 +47,7 @@
+  *  	 Morris Jette, et al.
+ \*****************************************************************************/
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <signal.h>
+ #endif
+ #include <pthread.h>
diff --git a/parallel/slurm/patches/patch-src_common_xcgroup.c b/parallel/slurm/patches/patch-src_common_xcgroup.c
new file mode 100644
index 00000000000..35ca0581bbc
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_common_xcgroup.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_common_xcgroup.c,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/common/xcgroup.c.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/common/xcgroup.c
+@@ -217,7 +217,7 @@ int xcgroup_ns_mount(xcgroup_ns_t* cgns)
+ 		options = opt_combined;
+ 	}
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__APPLE__)
+ 	if (mount("cgroup", cgns->mnt_point,
+ 		  MS_NOSUID|MS_NOEXEC|MS_NODEV, options))
+ #else
diff --git a/parallel/slurm/patches/patch-src_common_xcgroup.h b/parallel/slurm/patches/patch-src_common_xcgroup.h
new file mode 100644
index 00000000000..1841bacf729
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_common_xcgroup.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_common_xcgroup.h,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/common/xcgroup.h.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/common/xcgroup.h
+@@ -49,7 +49,7 @@
+ #define XCGROUP_SUCCESS  0
+ 
+ // http://lists.debian.org/debian-boot/2012/04/msg00047.html
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
+ #define	MS_NOSUID	MNT_NOSUID
+ #define	MS_NOEXEC	MNT_NOEXEC
+ #define	MS_NODEV	0
diff --git a/parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c b/parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c
new file mode 100644
index 00000000000..13bc24ace0a
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c
+@@ -49,6 +49,9 @@
+ #include <getopt.h>
+ #include <netinet/in.h>
+ 
++#if defined(__NetBSD__)
++#include <limits.h>	/* PATH_MAX */
++#endif
+ 
+ #include "src/common/slurm_xlator.h"
+ #include "src/common/slurm_acct_gather_filesystem.h"
diff --git a/parallel/slurm/patches/patch-src_slurmctld_reservation.c b/parallel/slurm/patches/patch-src_slurmctld_reservation.c
new file mode 100644
index 00000000000..3a89e6db136
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_slurmctld_reservation.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_slurmctld_reservation.c,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/slurmctld/reservation.c.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/slurmctld/reservation.c
+@@ -44,7 +44,7 @@
+ #  include <pthread.h>
+ #endif				/* WITH_PTHREADS */
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <signal.h>
+ #endif
+ 
diff --git a/parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c b/parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c
new file mode 100644
index 00000000000..a00562a7c02
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_slurmd_common_setproctitle.c,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/slurmd/common/setproctitle.c.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/slurmd/common/setproctitle.c
+@@ -90,7 +90,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #endif
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <stdio.h>
+ #endif
+ #ifndef HAVE_SETPROCTITLE
diff --git a/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c b/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c
new file mode 100644
index 00000000000..2da1694adf5
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/slurmd/slurmstepd/task.c.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/slurmd/slurmstepd/task.c
+@@ -501,7 +501,12 @@ _make_tmpdir(slurmd_job_t *job)
+ 		 * still work with older systems we include this check.
+ 		 */
+ 
+-#if defined(__FreeBSD__)
++/* FIXME: Come up with a real solution for EUID instead of substituting RUID */
++#if defined(__NetBSD__)
++#define eaccess(p,m) (access((p),(m)))
++#endif
++
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #define	__GLIBC__ 		(1)
+ #define __GLIBC_PREREQ(a,b)	(1)
+ #endif
diff --git a/parallel/slurm/patches/patch-src_srun_libsrun_debugger.c b/parallel/slurm/patches/patch-src_srun_libsrun_debugger.c
new file mode 100644
index 00000000000..0f8aae3da6c
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_srun_libsrun_debugger.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_srun_libsrun_debugger.c,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/srun/libsrun/debugger.c.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/srun/libsrun/debugger.c
+@@ -38,7 +38,7 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ \*****************************************************************************/
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <signal.h>
+ #endif
+ 
diff --git a/parallel/slurm/patches/patch-src_srun_libsrun_launch.c b/parallel/slurm/patches/patch-src_srun_libsrun_launch.c
new file mode 100644
index 00000000000..0bfde117062
--- /dev/null
+++ b/parallel/slurm/patches/patch-src_srun_libsrun_launch.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_srun_libsrun_launch.c,v 1.1 2013/12/06 06:05:30 asau Exp $
+
+--- src/srun/libsrun/launch.c.orig	2013-11-04 21:19:15.000000000 +0000
++++ src/srun/libsrun/launch.c
+@@ -36,7 +36,7 @@
+ #include <stdlib.h>
+ #include <fcntl.h>
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <signal.h>
+ #endif
+