Conflicts:
	src/slurmctld/job_mgr.c

it turns out SLES 11 SP3 (at least) defines it with a newline, so
this will be a problem for anyone building RPMs on that OS.

Without this patch, jobs with an infinite time limit would have
their preemption GraceTime ignored.

For the salloc, sbatch and srun commands, report usage of the
--signal option when the user requests command help.

related to bug 789

them.

commit 8ddadea5 combined all
pending jobs, even if they had the special exit flag set. This
treats pending and special_exit state jobs differently. Only those
jobs with state pending (and NOT special_exit) are combined in
squeue.

Modify slurmd to use the ChosLoc configuration parameter to
control how slurmstepd is launched.

Added ChosLoc configuration parameter in slurm.conf (Chroot OS tool
location).
bug 685

No change to logic

Conflicts:
	META
	NEWS

In slurm.spec file, replace "Requires cray-MySQL-devel-enterprise" with
"Requires mysql-devel" per David Gloe.

Permit jobs steps full control over cpu_bind options if specialized cores
are included in the job allocation.
bug 782

Conflicts:
	contribs/perlapi/libslurm/perl/typemap
	src/slurmctld/acct_policy.c

Related to bug 771

Conflicts:
	doc/html/gres.shtml
	src/slurmctld/slurmctld.h

Add an error code to the information passed to LUA

Avoid build Lua script build error with --enable-developer.
There was an unused variable, so it never reporting a valid LUA
when built with that option.

In version 14.03.2 was using "slurm_<jobid>_4294967294.out" due to
error in job array logic.

cnode counts.

No change in logic, only clean up function description.

Enforcement of file allocations requires use of task/cgroup.

Conflicts:
	META
	NEWS