Conflicts:
	META
	NEWS

Conflicts:
	META

Done in response to bug 1323

Fix for bug 1320

a partition.

Add some parsing for interactive job support
Add parsing of Slurm set burst_buffer job field values

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.

Conflicts:
	src/common/assoc_mgr.c

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.