Conflicts:
	META

released.

than before.

COULD TAKE A WHILE TO CREATE THE KEYS SO BE PATIENT.

Error on -a and -p being specified on the same line.
Bug 1201

This reverts commit eb752cdc.

sinfo -a also overrides sinfo -p.
Bug 1201

Conflicts:
	META

This was an unrealized regression from commit 0da01963.  The problem
is we were clearing the job_ptr->job_resrcs too early.  This patch fixes
it to wait until the job is actually being requeued so it does the right
thing.

not running.

Move spank_user_task() call in slurmstepd after the task_g_pre_launch()
so that the task affinity information is available to spank.

pack it this way so we will not change it in 15.08

Conflicts:
	src/slurmctld/node_scheduler.c

Bug 1202

then jobs pending with invalid dependency are going to be terminated.

Conflicts:
	src/slurmctld/job_mgr.c

This isn't that big of an issue for 14.03, but 14.11 added more to this
string which could overflow the buffer since sprintf is used instead of
snprintf.  Using xstrfmtcat fixes the issue and is easier to read code.

proper functionality.