Conflicts:
	NEWS

with autoconf older than 2.63b.  Adding the extra sed at the end does the
same thing (strip off the newline)

preforms the allocation, regression in 2.6.3.

job is completing.

Previously the SlurmdDebug value in slurm.conf was ignored if the
previous value was not 3/init

Effect is minimal without multiple partitions and larger system sizes.
With 40 partitions and about 600 nodes each, time goes from about
13 secs to 4 secs).

Reorder some logis in the hostlist functions for performance improvement
specifically for "if (A & B) ..." move the fastest tests first (test
A should take less time than test B).

This avoids building hostlist information with NodeHostName and
NodeAddr information unless explisitly requested and can improve
performance for the default mode of operation by about 65%.

Correct sbatch documentation and job_submit/pbs plugin "%j" is job ID,
not "%J" (which is job_id.step_id).

Conflicts:
	NEWS
	src/plugins/proctrack/cgroup/proctrack_cgroup.c

Specifically setting innodb_buffer_pool_size=64
in my.conf

Without this change a job with a reason of WAIT_PART_DOWN,
WAIT_PART_INACTIVE, WAIT_PART_NODE_LIMIT, WAIT_PART_TIME_LIMIT, or
WAIT_QOS_THRES would not be cleared when that reason no longer
applied.

In the event of a race condition on cgroup create/delete calls
in separate job steps, replace retry logic with a lock. This is
an enhancement of the retry logic recently added to version 2.6,
but the more complex logic (here) is only being added to v13.12.

This hardens the code although no such problem has been observed

Minor code enhancements to select/cons_res:
Replace loop and value set with memcpy
Eliminate redundant zero set of memory being freed

Add cgroup create retry logic in case one step is starting at the
same time as another step is ending and the logic to create
and delete cgroups overlaps.
bug 447

I did the merge improperly

If a node has GRES and multiple threads per core the select/cons_res
plugin can get stuck in an infinite loop.
See bug 475
Contributed by:
PREVOST Ludovic
NEC HPC Europe

If slurmd fails to get IPMI value, then I propose to force to wait 1 second instead of asking BMC again. (Part 3/4 of the patch).
If IPMI init fails when slurmd forces to update the value, then we should not update the value. (Part 4/4 of the patch
Part 1/4 and 2/4 add a security in IPMI init because the function can be call several time.
This force to return SLURM_FAILURE if the first call failed, since the other call will not do anything.

bug 469