Conflicts:
	NEWS

Fix Cray NHC spawning on job requeue. Previous logic would leave nodes
allocated to a requeued job as non-usable on job termination.

Specifically, each job has a "cleaning/cleaned" flag. Once a job
terminates, the cleaning flag is set, then after the job node health
check completes, the value gets set to cleaned. If the job is requeued,
on its second (or subsequent) termination, the select/cray plugin
is called to launch the NHC. The plugin sees the "cleaned" flag
already set, it then logs:
error: select_p_job_fini: Cleaned flag already set for job 1283858, this should never happen
and returns, never launching the NHC. Since the termination of the
job NHC triggers releasing job resources (CPUs, memory, and GRES),
those resources are never released for use by other jobs.

Bug 2384

An error in slurmconfgen_smw.py caused it to parse the nic as the nid.
On some systems those values differ, causing the generated slurm.conf file to
be incorrect.

Bug 2532.

_set_collectors() already has a run_in_daemon("slurmd") that
precludes this from being an issue.

route_p_split_hostlist was not thread-safe, and would cause
one of several segfaults depending on where in the initialization
code each thread was.

Bug 2495.

Was incorrectly displaying "(null)" even when loaded successfully.

burst_buffer/cray plugin: Prevent a requeued job from being restarted while
    file stage-out is still in progress. Previous logic could restart the job
    and not perform a new stage-in.
bug 2584, comment #45

possible bug in smap Makefile

LIBS can have a previous value, as depicted in ./configure --help

"Some influential environment variables:
(...)
 LIBS        libraries to pass to the linker, e.g. -l<library>
"
Original assignation to LIBS overwrites this value. With this edition, the user defined flags and NCURSES ones are both employed by the linker.

Fix Cray NHC spawning on job requeue. Previous logic would leave nodes
allocated to a requeued job as non-usable on job termination.

Specifically, each job has a "cleaning/cleaned" flag. Once a job
terminates, the cleaning flag is set, then after the job node health
check completes, the value gets set to cleaned. If the job is requeued,
on its second (or subsequent) termination, the select/cray plugin
is called to launch the NHC. The plugin sees the "cleaned" flag
already set, it then logs:
error: select_p_job_fini: Cleaned flag already set for job 1283858, this should never happen
and returns, never launching the NHC. Since the termination of the
job NHC triggers releasing job resources (CPUs, memory, and GRES),
those resources are never released for use by other jobs.

Bug 2384

An error in slurmconfgen_smw.py caused it to parse the nic as the nid.
On some systems those values differ, causing the generated slurm.conf file to
be incorrect.

Bug 2532.

This matches the documentation

_set_collectors() already has a run_in_daemon("slurmd") that
precludes this from being an issue.

route_p_split_hostlist was not thread-safe, and would cause
one of several segfaults depending on where in the initialization
code each thread was.

Bug 2495.

Was incorrectly displaying "(null)" even when loaded successfully.

Capture MCDRAM percentages for various configurations from capmc.
This assumes the percentages for various configurations will be
identical for all nodes within a cluster.

clang found a deferencing null issue which lead to finding the parsing error.

Added new job dependency type of "aftercorr" which will start a task of a
    job array after the corresponding task of another job array completes.
bug 2460

In particular, it seems that MariaDB has changed the default for
innodb_lock_wait_timeout has been lowered which can cause issues
for the various rollup processes on systems with high job counts.

Fix some timing issues with respect to rebooting a node, especailly
KNL node needing reboot to change configuration.

would only track gres/gpu, now it will track both gres/gpu and
gres/gpu:tesla as separate gres if configured like
AccountingStorageTRES=gres/gpu,gres/gpu:tesla

--gres=gpu:tesla

before you needed to give a count

--gres=gpu:tesla:1

now both should work.

Step GRES value changed from type "int" to "int64_t" to support larger
values.

Signed-off-by: Danny Auble <da@schedmd.com>

These changes apply to both the main scheduling logic and backfill
scheduler. If some SchedulerParameters value was configured, the
slurmctld started, then completely removed, and slurmctld reconfigured
the value would not be reset to it's default value but the originally
configured value would persist until slurmctld restarted.

Continuation of 31225a82