Conflicts:
	doc/html/faq.shtml

nested loops.

in SLURM. to get correct state.

block happens correctly now.

Add the ability to update a node's NodeAddr and NodeHostName with scontrol.
Also enable setting a node's state to "future" using scontrol.

Also message fix packing problem

Patch from Andriy Grytsenko (Massive Solutions Limited).

This is an updated version of code to read the slurm.conf file from
the slurmdbd daemon. This adds support for the cluster name. Patch
from Andriy Grytsenko (Massive Solutions Limited).

Major re-write of the CPU Management User and Administrator Guide (web
page) by Martin Perry, Bull.

If a job can not run due to QOS or association limits, then do not cancel
the job, but leave it pending in a system held state (priority = 1). The
job will run when its limits or the QOS/association limits change. Based
upon a patch by Phil Ekcert (LLNL).

booted block. -- pass 1, more work needs to be done.

Remove unused function acct_policy_node_usable() from src/slurmctld/acct_policy.c

Prevent associations from being delete if it has any jobs in running,
pending or suspended state. Previous code prevented this only for running
jobs.

PluginDir is a path. It shouldn't be an error to have duplicate
plugins in your path. Plus, the error is not helpful because it
doesn't specify which path is not being loaded. Therefore, just
remove the error and load the first plugin in the path as expected.

Fix bugs in sched/backfill with respect to QOS reservation support and job
time limits. Patch from Alejandro Lucero Palau (Barcelona Supercomputer Center).

Fix to GRES allocation logic when resources are associated with specific
CPUs on a node. Patch from Steve Trofinoff, CSCS.