Conflicts:
	NEWS
	auxdir/x_ac_munge.m4

Add support for multiple sets of DEFAULT node, partition, and frontend
specifications in slurm.conf. New DEFAULT options overwrite old options,
but those not explicitly changed are preserved.

Added Logic to make it so you can emulate a cray system and not have to enforce the things you do on a real one.

Transfer all of the node fields to reorder them by node_rank.
Old logic only transferred some fields, which caused problems
on heterogeneous clusters.

Fix some typos and improve technical content of the SLURM design
documents for job launch and gres support.

Added a web page to describe the job launch and termination process
and made a minor enhancement to the GRES design document.

Conflicts:
	src/slurmctld/node_mgr.c
	src/slurmctld/node_scheduler.c

Patch from Andriy Grytsenko (Massive Solutions Limited).

Synchronize power-save module better with scheduler.
Without this change, returning a node to service was typically
delayed longer than necessary.
Patch from Andriy Grytsenko (Massive Solutions Limited).

Report scontrol job job PreemptTime=None rather than PreemptTime=NO_VAL
if not set. Patch from Bill Brophy, Bull

This expands the description of how to build slurm using a git repository.

Modify job expansion logic to support licenses, generic resources, and
currently running job steps in the job which is expanding.

This improves the initial configuration code:
 a) Better handling of DownNodes lines
    The previous basil_geometry() would set the node Reason field on failure,
    irrespective of whether that node has been marked using a DownNode line.

 b) Check all cases of nodes being invisible to ALPS
    Up until now basil_geometry() had to be fixed each time a new source of
    discrepancy between ALPS and SDB state had been discovered (most recent
    case was NULL coordinates when taking out a blade). Depending on ALPS
    interface changes, there may be other possibilities. Instead of fixing the
    SLURM code for each new case, it is better to check whether SLURM and ALPS
    agree. The price is some tiny delay at SLURM initialisation time (since each
    node is first looked up in the ALPS inventory), but it pays well off as it
    eases system administration by pointing to the source of error.
    Any node that has suddenly disappeared from ALPS horizon will now show up in
    the logs, and also in marked down in sinfo.

 c) At initialisation time, give a summary as to how many ALPS nodes are online.

 d) Turn ALPS-node-invisibility error into warning message, since such nodes may
    already have been covered in a DownNodes statement.

By merging basil_get_initial_state() into basil_geometry(), the previously separate
knowledge about system state (database state, ALPS inventory) is combined, allowing
to more easily identify sources of failure.
Patch from Gerrit Renker, CSCS.

Logging message was misleading and incorrect pointer used in another.

Former logic failed to properly allocate resources to a job step
when specifying both a task count and a node count range on a
heterogeneous cluster.

BLUEGENE - Fixed print of geo portion of the select_jobinfo struct to work correctly with the regession tests.

Latest Cray-specific modifiations