Fix minor bug with missing ; and add logic to make it so the num_tasks are set when only the number of nodes is specified using the srun wrapper.

Preserve last job ID across slurmctld restarts even if the job state file
can not be completely recovered.

Note that changes in the SelectType configuration parameter requires
the slurmctld daemon to restart and all job state information will be
lost.

Pull request from SchedMD branch

Remove references to private companies doing SLURM development
and support to satisfy LLNL.

This reverts the introduction of "fake" Y coordinates in order to disambiguate
nodes sharing the same Gemini network interface. Their introduction breaks
assumptions that may be present e.g. in scripts, and also it is no longer
easily possible to pair nodes sharing a Gemini chip for optimal performance.

Show the real coordinates instead, which is more transparent.
Patch from Gerrit Renker, CSCS.

Fix issue with accounting when using PrivateData=jobs... users would not be able to view there own jobs unless they were admin or coordinators which is obviously wrong.

Prevent opaque ncurses WINDOW struct on OS X 10.6.

Define something for SIGRTMIN so the compile will work on OS X.

Conflicts:
	NEWS

Since RT sigs don't exist on osx, define the min RT sig to be above the current highest (SIGUSR2) so things will compile anyway. RT sigs are only used for alps integration anyway (which isn't going to be necessary on osx).

Preserve a job's dependency information with respect to expanding
another job. Previously the dependency information would be purged
from the string almost immediately as part of the logic to designed
to only report current dependency information.

If gang scheduling is configured, then expanding a job can only proceed
if both jobs execute in the same time slice. For now, just disable job
expansion if either job involved in the expansion is suspended. This
limitiation might be removed in the future.

Recent cray-specific patches and some minor code refinements

 1. Simplification by generating the indices via the built-in ipairs function.

 2. Avoid encountering an error when trying to unset job_desc fields by
    assigning the  special Lua value `nil':

    [2011-04-23T13:28:51] error: job_submit/lua: /opt/slurm/default/etc/job_submit.lua:106: \
			bad argument #3 to '_set_job_req_field' (string expected, got nil)
    The error is avoided by testing for a nil value and using an empty string instead.

Tested script to work after applying changes.
Patch from Gerrit Renker, CSCS.

Found while reading mgr.c, often MAXPATHLEN is 1024, but not sure it is always.
Patch from Gerrit Renker, CSCS

This adds user documentation on how memory is specified by ALPS (per-PE share) and SLURM
(per-node or per-CPU units), clarifying the correspondence.
Since it is a correspondence, but not a direct equivalence, the patch also removes the
PBS-script directive support for 'mppmem', since otherwise it would lead to unexpected
behaviour. From Gerrit Renker, CSCS.

Conflicts:
	src/plugins/select/cons_res/select_cons_res.c
	src/plugins/select/linear/select_linear.c

made initial changes to allow setting the correct coordinates in a small block when trying to run sub-block jobs.