Conflicts:
	NEWS

Major update to license management tests.
"Manager" was changed to "ServerType" and several tests made more
complete and improved reporting of failures.

For the sacctmgr command, the keyword "Manager" was changed to
"ServerType" in some, but not all places. This changes the
previously unchanged places.

The test keeps failing due to a POE bug

This fixes the advanced reservation test with a configuration that
sets a node's CPU count to be equal to the core count rather than
its thread count.

The original formatting had a bunch of lists rather than paragraphs,
the numbers did not add up in the use case, and some wording was
changed for clarity.

Bug #1143

This commit fixes a bug we observed when combining select/linear with
gres. If an allocation was requested with a --gres argument an srun
execution within that allocation would stall indefinitely:

-bash-4.1$ salloc -N 1 --gres=gpfs:100
salloc: Granted job allocation 384049
bash-4.1$ srun -w j3c017 -n 1 hostname
srun: Job step creation temporarily disabled, retrying

The slurmctld log showed:

debug3: StepDesc: user_id=10034 job_id=384049 node_count=1-1 cpu_count=1
debug3:    cpu_freq=4294967294 num_tasks=1 relative=65534 task_dist=1 node_list=j3c017
debug3:    host=j3l02 port=33608 name=hostname network=(null) exclusive=0
debug3:    checkpoint-dir=/home/user checkpoint_int=0
debug3:    mem_per_node=62720 resv_port_cnt=65534 immediate=0 no_kill=0
debug3:    overcommit=0 time_limit=0 gres=(null) constraints=(null)
debug:  Configuration for job 384049 complete
_pick_step_nodes: some requested nodes j3c017 still have memory used by other steps
_slurm_rpc_job_step_create for job 384049: Requested nodes are busy

If srun --exclusive would have be used instead everything would work fine.
The reason is that in exclusive mode the code properly checks whether memory
is a reserved resource in the _pick_step_node() function.
This commit modifies the alternate code path to do the same.

This commit fixes a bug we observed when combining select/linear with
gres. If an allocation was requested with a --gres argument an srun
execution within that allocation would stall indefinitely:

-bash-4.1$ salloc -N 1 --gres=gpfs:100
salloc: Granted job allocation 384049
bash-4.1$ srun -w j3c017 -n 1 hostname
srun: Job step creation temporarily disabled, retrying

The slurmctld log showed:

debug3: StepDesc: user_id=10034 job_id=384049 node_count=1-1 cpu_count=1
debug3:    cpu_freq=4294967294 num_tasks=1 relative=65534 task_dist=1 node_list=j3c017
debug3:    host=j3l02 port=33608 name=hostname network=(null) exclusive=0
debug3:    checkpoint-dir=/home/user checkpoint_int=0
debug3:    mem_per_node=62720 resv_port_cnt=65534 immediate=0 no_kill=0
debug3:    overcommit=0 time_limit=0 gres=(null) constraints=(null)
debug:  Configuration for job 384049 complete
_pick_step_nodes: some requested nodes j3c017 still have memory used by other steps
_slurm_rpc_job_step_create for job 384049: Requested nodes are busy

If srun --exclusive would have be used instead everything would work fine.
The reason is that in exclusive mode the code properly checks whether memory
is a reserved resource in the _pick_step_node() function.
This commit modifies the alternate code path to do the same.

(i.e ArchiveJobs PurgeJobs).  This is only a cosmetic change.

on slurmdbd startup.

lots of jobs.

Conflicts:
	src/common/read_config.c

BUG #1149

the SelectTypeParameters to magically set to CR_CPU.

definitions needed for drmaa.

Conflicts:
	src/plugins/select/alps/cray_config.h

did the ALPS reservation.  Bug 1115

You can find attached a patch that make hwloc, freeipmi, ofed and rrdtool autoconf macros honor the --without-rpath flag when set, like munge and bluegene macros already do.

instead of 8.

The spank_fini() function is registered with atexit() to be called
after termination of the srun main() function. The registered
functions are inherited by the forked shepard process and thus
spank_fini() is called twice.
This commit fixes this problem by introducing a wrapper function
_call_spank_fini() that is a no-op in the context of the shepard
process.