Conflicts:
	META

Done in response to bug 1323

other config files like bluegene.conf and such.

If a QOS was added for the job and then removed and it just happened
to be the largest QOS id wise if the slurmctld was restarted and the job
wasn't flushed out yet it could mess things up.

Conflicts:
	src/plugins/task/cray/task_cray.c

slurmdb_purge_string(), there is no reason to check for this specific
value anymore in read_config().

and initialize kvs_seq on mpi/pmi2 setup to support launching.

it also need client side.

Log how many nodes are removed from consideration from jobs due to
  advanced reservation.
Change user error message to indicated that required nodes might
  be down, drained or (added this bit) reserved.

In proctrack/linuxproc and proctrack/pgid, check the result of strtol()
for error condition rather than errno, which might have a vestigial error
code.

correctly.

accounting_storage/filetxt.

Make the standard smap job information display fit in an 80 character
wide window. Recently expanded size for job array ID was 81 characters.
Expand minimum window size for smap to run from 72 to 80 characters.

Sufficiently large jobids (greater than INT_MAX) are displayed
incorrectly by smap. Change output of jobid to support uint32_t
values and shift remaining colums appropriately to the right.

when running from cache.

Bug 1305

Fix bug with GRES having multiple types that can cause slurmctld abort.
This can be reproduced with select/cons_res and one Gres like this:
Name=gpu Type=kepler File=/dev/tty0
A bad index was being used that caused an assert.

Logic introdiced in version 14.03.10 to support requeueing of jobs
with GRES allocated to currently running steps broke select/linear
due to differernces in the plugin logic. The commit with the bad
logic is 1209a664

Bug 1298

Bug 1301

have no weight.  This allows for association and QOS decay limits to work.

option.