Clarify PriorityFlags configuration parameter use
Replace the tempname() function call with mkstemp().
Make regression test more robust

Expect was failing periodicallly due to apparent timing problems
cpu/mem_bind fix

Fix for --cpu_bind=map_cpu/mask_cpu/map_ldom/mask_ldom plus
--mem_bind=map_mem/mask_mem options, broken in 2.6.2.
See commit 718382da0d44fdea9f0151662def62c17637de05
Expand description of slurm.conf scheduling options
sched/backfill - Prevent invalid memory ref with bf_continue

If the backfill scheduler relinquishes locks and the normal job
scheduler starts a job that the backfill scheduler was actively
working, the backfill scheduler will try to re-schedule that
same job, possibly resulting in an invalid memory reference
or other badness.
Make slurmd -C format match slurm.conf

Change Sockets to SocketsPerBoard and Procs to CPUs
Merge branch 'slurm-2.6'

Conflicts:
	doc/man/man5/slurm.conf.5
	testsuite/expect/test1.89
	testsuite/expect/test1.90
Increase default file wait time for SMD

File delays sometimes larger than 60 seconds
Make test more robust

Expect timing was sometimes causing failures
select/cons_res - allocate cores cyclic across sockets

Restore default behavior of allocating cores to jobs on a cyclic basis
across the sockets unless SelectTypeParameters=CR_CORE_DEFAULT_DIST_BLOCK
or user specifies other distribution options.
Reverts commit 7fcdc7e5488b1fa7d4305a85d68138d360ea5cb4
bug 466
Merge branch 'slurm-2.6'
Describe step memory=0 use in srun man page
CRAY - fixes syncing jobs
CRAY - only run select_p_job_init on startup
Enforce JobRequeue configuration parameter

Previously a node failure would always requeue the job
Increase timeout on test with poe
acct_gather_energy/ipmi - Add delay before retry on read error.

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
Document latest patch changes in NEWS
Add contributor to our web page