Minor check fix, shouldn't matter since if one of these is set then they both
would be set, but this is safer.
PMI2 attributes for network info (from switch/generic)
BLUEGENE - If IONodesPerMP changes in bluegene.conf recalculate bitmaps
based on ionode count correctly on slurmctld restart.
Merge branch 'master' of github.com:SchedMD/slurm into pmi2
Pmi2 server code which implements hosts ip adresses and mpi reserved
ports.
Just rename a variable

No change in logic, just rename a variable for better clarity.
Remove spaces from spank.h as per coding guide.
Explain group limit enforcement logic
Note that clusters must be defined before users

For Kelly ;)
Update man pages related to overcommit option
Expand explanation of srun exclusive option
Fix step allocation failure due to memory use

Fix step allocation when some CPUs are not available due to memory limits.
This happens when one step is active and using memory that blocks the
scheduling of another step on a portion of the CPUs needed. The new step
is now delayed rather than aborting with "Requested node configuration is
not available".
bug 577
Merge remote-tracking branch 'origin/slurm-2.6'

Conflicts:
	src/plugins/select/bluegene/select_bluegene.c
	src/slurmctld/step_mgr.c
Make sure node limits get assessed if no node count was given in request.

i.e. salloc -n32 doesn't request the number of nodes and with the previous
code if this request used 4 nodes and only 1 was left in GrpNodes it
would just run with no issue since we were checking things before we
selected how many nodes it ran on.

Now we check this afterwards so we always check the limits on how many
nodes, cpus and how much memory is to be used.
Minor fixes to test to sleep slightly longer just to make sure the job
starts and then a minor typo fix
Removed obsolete slurm_terminate_job() API.
Merge remote-tracking branch 'origin/slurm-2.6'
Cray MPMD, create separate record by argument

If the Cray MPMD commands have different arguments then they should
appear in separate lines in the MPMD data structure.
Document where UnkillableStepProgram is executed
Merge branch 'slurm-2.6'