Conflicts:
	NEWS
	src/slurmctld/backup.c
	src/slurmctld/controller.c
	src/slurmctld/proc_req.c

This also reverts commit 8cff3b08 and
ced2fa3f

slurmdbd plugin.

9368ff2d

new associations were added since it was started.

If tests in inc21.30.1 failed, the exit_code was getting cleared
so the test21.30 as a whole never recognized the failure.

Permit user root to propagate resource limits higher than the hard limit
slurmd has on that compute node has (i.e. raise both current and maximum
limits).
bug 674674674674674674

Previous test would calculate negative new limits when original limits
were small.
See bug 675

Permit multiple batch job submissions to be made for each run of the
scheduler logic if the job submissions occur at the nearly same time.
bug 616

Decrease maximimum scheduler main loop run time from 10 secs to
4 secs for improved performance.
If running with sched/backfill, do not run through all jobs on
periodic scheduling loop, but only the default depth. The
backfill scheduler can go through more jobs anyway due to its
ability to relinquish and recover locks.
See bug 616

if an job step's network value is set by poe, either by directly
executing poe or srun launching poe, that value was not being
propagated to the job step creation RPC and the network was not
being set up for the proper protocol (e.g. mpi, lapi, pami, etc.).
The previous logic would only work if the srun execute line
explicitly set the protocol using the --network option.

Permit multiple batch job submissions to be made for each run of the
scheduler logic if the job submissions occur at the nearly same time.
bug 616

Decrease maximimum scheduler main loop run time from 10 secs to
4 secs for improved performance.
If running with sched/backfill, do not run through all jobs on
periodic scheduling loop, but only the default depth. The
backfill scheduler can go through more jobs anyway due to its
ability to relinquish and recover locks.
See bug 616

if an job step's network value is set by poe, either by directly
executing poe or srun launching poe, that value was not being
propagated to the job step creation RPC and the network was not
being set up for the proper protocol (e.g. mpi, lapi, pami, etc.).
The previous logic would only work if the srun execute line
explicitly set the protocol using the --network option.

Do not overcommit partitions with PreemptMode=off

Prevent preemption of jobs in partition where PreemptMode=off

Define hwloc_const_bitmap_t as typdef hwloc_const_cpuset_t
Build fails in task_cgroup_cpuset.c when using an older hwloc (v1.0.2)
due to missing definition of hwloc_const_bitmap_t.

This reverts commit 084787c0.

Conflicts:

	NEWS
	contribs/pmi2/pmi2_api.c
	src/plugins/mpi/pmi2/mpi_pmi2.c

No change in logic