Conflicts:
	src/plugins/sched/backfill/backfill.c

Conflicts:
	src/common/slurm_protocol_api.c
	src/slurmctld/job_scheduler.c
	src/slurmctld/proc_req.c

Modify the task affinity tests to support systems with larger CPU
counts. Use data type long long unsigned int rather than just int.
see bug 672

Rather than treat invalid SchedulerParameters options as a fatal
error, print an error and use to the default value.

Disables job scheduling when there are too many pending RPCs

This is related to defering batch job scheduling if there
are a bunch of requests pending

rather than 1 sec interval retries

If pthread_create call fails, decrease sleep before retry from
1 sec to 0.1 sec

Conflicts:
	NEWS

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

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

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.

Modify the task affinity tests to support systems with larger CPU
counts. Use data type long long unsigned int rather than just int.
see bug 672

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

Added SchedulerParameters options of bf_yield_interval and bf_yield_sleep
to control how frequently and for how long the backfill scheduler will
relinquish its locks.

Prevously reset only the counters, now reset the IDs to better
clean things up and avoid reporting a bunch of zero values.

Add rpc_num2string() function to convert RPC message type numbers
to strings and modify sdiag to use that for its RPC reports.

Conflicts:
	NEWS

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.