Minor clarifications in man page of how cgroups handles memory limits
switch/nrt - Don't allocate network resources unless job step has 2+ nodes
Merge branch 'slurm-2.5' into slurm-2.6
Set exit code for sacctmgr on many error conditions
Merge branch 'slurm-2.6'
Correction to memory limit calculation for mem per cpu with threads

When using ThreadsPerCore > 1, it appears that DefMemPerCPU is being
scaled by slurmctld, but not by slurmd/slurmstepd.

For example, we set ThreadsPerCore=2 and DefMemPerCPU=100. Running a
single core job, we would expect two threads to be allocated and AllocMem
on the assigned node to increase by 200MB. scontrol reports that AllocMem
increased by 200MB, but the task/cgroup plugin only sees 100M of RAM.

It looks like the problem may lie in common/slurm_cred.c:format_core_allocs().
The function counts the job/step cores and multiplies the mem_limit's,
but it does not scale the CPU count like in slurmd/slurmd/req.c:_check_job_credential().
See bug 309
Merge branch 'slurm-2.6'
Requeue batch job if it's node reboots (used to abort the job).
Enlarge maximum size of srun's hostlist file.

Previously srun would fail if the hostlist expression was larger
than 0xffff bytes.
Merge branch 'slurm-2.6'
IPMI - Fix first poll to get correct consumed_energy for a step.
Merge remote-tracking branch 'origin/slurm-2.6'
CRAY - Set #ifdef's correctly for a cray alps system
CRAY - Add -ljob to the task/cray plugin
Move AM_CPPFLAGS to only be used if BLCR is to be built
CRAY - Change headers from HAVE_CRAY to HAVE_ALPS_CRAY
CRAY - capitalize ALPS
CRAY - Add --enable-native-cray option
change cray-native to native-cray
Fix typo