Conflicts:
	src/slurmctld/acct_policy.c

Most of these don't matter as they are all NO_LOCK

Fallout from commit f1ebdef1 when the resources were added.

Requires netloc and hwloc files.
Also requires hwloc v1.11+ (not yet released).

This only adds the field to data structures and does not implement support

Remove GRES spec from burst_buffer.conf
  There is no logic in the generic plugin to support this and the
  cray plugin does not get the information from the config file.
Change allow/deny user separator from colon to comma
Confirm AllowUsers for swap and gres space
Make sure nodes not shared on cray system
Minor changes in several other places

Conflicts:
	META
	NEWS
	src/plugins/mpi/pmi2/tree.c

This is needed for setups like this

TaskPlugin = affinity
TaskPlugin = task/affinity,task/cgroup
TaskPlugin = affinity,cgroup

Modify contribs/sgi Makefile and netloc_to_topology.c to use
configure parameters related to netloc install

Document how to build an SGI hypercube configuration file.

The "full info" display was not working
Duplicate records sometimes were displayed
The job ID information might have been trucated
Add comment that burst_buffer memory leak check is needed

Fix job array bug

This gets BB working with job arrays

Bug 1352

Add support for job arrays (mostly working)

Bug 1352

Slurm 14.03 nccs

Intel MPI, on MPI jobs initialisation through PMI, uses to call PMI_KVS_Put()
many many times from task at rank 0, and each on these call is followed by
PMI_KVS_Commit(). Slurm implementation of PMI_KVS_Commit() imposes a delay
to avoid DDOS on original srun. This delay is proportional to the total number.
It could be up to 3 secs for large jobs for ex. with 7168 tasks. Therefore,
when Intel MPI calls PMI_KVS_Commit() 475 times (mesured on a test case) from
task at rank 0, 28 minutes are spent in delay function.
All other tasks in the job are waiting for a PMI_Barrier. Therefore, there is
no risk for a DDOS from this single task 0. The patch alters the delaying time
calculation to make sure task at rank 0 will does not be delayed. All other
tasks are globally spreaded in the same time range as before.

Move a couple more variable definitions to the top of a block

Added Makefile for contribs/sgi file.
Moved hypercube symbol definitions from select/linear to common.
Minor format changes for consistency with other Slurm code.
Moved a variable definition (l_distance) to start of code block
   to avoid error with some compilers.
Fix for possible uninitialized variable use (leftover_nodes).