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'