BLUEGENE - Added block node cnt to be able to differentiate between a sub-block job and a regular full block job.

Conflicts:
	src/plugins/select/bluegene/bg_record_functions.c

BLUEGENE - if a block goes into an error state.  Fix issue where accounting wasn't updated correctly when the block was resumed.

Clearly document that only PreemptType=preempt/partition_prio can be
used with PreemptMode=suspend. Only partition data structures exist in
the module that suspends and resumes jobs.

The node state was formerly reported "UNKNOWN" on node state change
request errors.

This restores proper slurmd hostname resolution on Frontend systems
(BlueGene and Cray) which was broken by commit 635abaea
adding support for the slurmd -f option.

Remove local timer functions and make use of functions in src/common/timers.[ch]

Change diff_tv_str() to slurm_diff_tv_str() and
diff_tv() to slurm_diff_tv() so the symbols are exported
for use in the pmi library

Remove "inline" declarations on extern functions in src/common
so that the symbols are available to plugins.

When enforcing accounting, fix polling for unknown uids for users after the slurmctld started.  Previously one would have to issue a reconfigure to the slurmctld to have it look for new uids.

Reset priority to 0 when a job is requeued by wiki2

Conflicts:
	src/common/slurm_protocol_defs.h

Apply more patches to build SLURM on OSX. Patches from Tyler Strickland.

The job needs to be held by slurm until a STARTJOB command is
received from Moab.

Fix the setting of SLURM_TASKS_PER_NODE environment variable
in job step as needed by some MPI implementations. This was
just broken in SLURM while adding new environment variables
for BlueGene/Q sub-block jobs.

Patch from Jon Bringhurst, LANL.

Add abstracts to the Slurm User Group Meeting 2011 agenda

Add job id to the information loggedn when a REQUEST_SPANK_ENVIRONMENT
RPC is issued. Patch from Andriy Grytsenko.

Conflicts:
	src/slurmd/slurmd/slurmd.c

Get slurmd -f option working. Patch from Andriy Grytsenko.

BLUEGENE - fixed issue where if a step took up an entire small block to print out the cnodes associated with it.