Conflicts:
	src/plugins/select/cons_res/job_test.c

Without this, the record of gres allocated to steps will remain
allocated and not be available to job steps after being requeued.

sched/backfill - If job started with infinite time limit, set its end_time
one year in the future. Previous logic would based it upon INFINITE and
produce an overflow of the uint32_t time.

Report correct CPU count allocated to job when allocated whole node even if
not using all CPUs.
bug 909

Rather than relying upon the default shared value being (uint16_t)NO_VAL;

Don't log the job's incoming nice value is NO_VAL - NICE_OFFSET

A function was added in commit 7cae0abb
that was essentially identical to a previously existant function.
The redundant function has been removed.

Fix bug which could report to squeue the wrong partition for a running job
that is submitted to multiple partitions.

you could get multiple '*' wckeys.

deleting users.

able to be destroyed for debug.

Disable testing of QOS and association limits if the Slurm installation
lacks the configuration to support them.

This reverts commit 43d7340e496f679a90cb97d7de8435ad6703c53e.
Moving to v14.03 branch

For each job the backfill scheduling is testing, print not only
the job ID, but also its priority and partition.

For each job the backfill scheduling is testing, print not only
the job ID, but also its priority and partition.

Correction to commit aeecd03c
for some configuration

Help to identify the problem on authentication type mismatch

Change the log format to match that of slurm.conf

Clarify the meaning of the AllowGroups configuration parameter a bit more.

Original version did not end an indent properly

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

Remove some debugging logic accidentally included in commit
7a187f10

sched/backfill: Correct job start time estimate with advanced reservations.
Under some conditions, the job start time would be set to the end time
of an advanced reservation that may have nothing to do with that job's
resource requirements.
bug 911

Log more backfill scheduling actions including where/when jobs will run even if they can not start until long in the future

file.

If we don't it could get messed up on a reconfig.