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