# Conflicts:
#	auxdir/x_ac_databases.m4
#	configure

Backport of commit cca1616b from 16.05

MCS plugin should not have been retroactively added to the 15.08 RPCs, and
caused 'scontrol show config' from a 15.08 scontrol to a 16.05 slurmctld to
fail.

# Conflicts:
#	src/common/node_conf.c

pmix >= 1.1.4.

Added info about changes to APIs, data structures, #defines, etc.

The slurm.spec file handles these separately, do not install through automake.

And run autogen.sh again.

bug 2597

anymore.

Some systems return EWOULDBLOCK rather than EAGAIN on recv() failure
This is an enhancement to commit af47b4b2

See bug 2672 for details

Correction to commit 5176f7bc

This fixes a problem introduced in commit
31aa3244
which was causing test1.91 to generate a fatal slurmd error.

Conflicts:
	NEWS

Copied select items from NEWS

# Conflicts:
#	NEWS

of Slurm.

to avoid potential deadlock.

a more timely manner.

Use TaskPluginParam for default task binding if no user specified CPU
    binding. User --cpu_bind option takes precident over default. No longer
    any error if user --cpu_bind option does not match TaskPluginParam.
bug 2655

No real code change.