Conflicts:
	NEWS

Avoid clearing a node's Arch, OS, BootTime and SlurmdStartTime when
    "scontrol reconfig" is run. Patch from Martin Perry, Bull.

this adds another instruction to the grant all on slurm_acct_db.*  TO 'slurm'@'system0';  where system0 is the hostname.  Our users have add errors from mysql  as shown below where it needs to be applied for both localhost and the hostname
From Nancy Kritkausky, Bull

Correct several man pages describing what a dpendency of afterok means.

This fixes a segfault that can happen when the user supplies an ill-formatted
SLURM_TIME_FORMAT string. Fixed by always initializing the display_fmt string.

Instead of segfaulting, the response now uses the fallback:
01_BUG-Fix_parse_time_segfault.diff from Gerrit Renker, CSCS.

When using an emulated setting, the user is likely to specify both apbasil and
apkill, hence the AlpsDir variable could be refactored, which is what the patch
does. It falls back to the Cray-like defaults (/usr/bin) if nothing is set.
05_COSMETICS_Cray-conf-AlpsDir-simplification.diff from Gerrit Renker, CSCS

Especially on long listings of jobs or records, there is very little variation in
adjacent entries, causing repetition of output which can make it difficult to
quickly see changes.

This also makes it easier to spot outliers: as in the example a the end of
April below, where a user had set a BeginTime of about 1 month in advance:

JOBID  USER     ACCOUNT               NAME     REASON NODES  TIMELIMIT   START_TIME
54936  teyssier    s201     cut_largemodes   Priority    16 1-00:00:00     18:37:30
33544  jgomez       s89        Rh_12x12-4L   Priority     8 1-00:00:00     18:39:02
40798  jgomez       s89        Rh_8x8x8_D3   Priority    20   23:59:00     18:40:29
31994  xyy         s241     new-3g5u-lipid   Priority    22 1-00:00:00     18:40:29
32072  gstarek     s241        alpha_vs_dp   Priority    22 1-00:00:00     18:40:29
32078  gstarek     s241         control_vs   Priority    22 1-00:00:00     18:40:29
31699  jgomez       s89            CHP_120  BeginTime    20 1-00:00:00 29 May 16:43
22121  guerard     s263          an18QM370 Dependency     8    2:00:00          N/A

The patch introduces a context-sensitive time format which is
 * disabled by default
 * enabled via SLURM_TIME_FORMAT environment variable,
 * prints 24-hour clock based time relative to "now",
 * takes up at most 12 characters (i.e. 1/2 character per hour).

The following compares the formats for a range of settings:

  1) SLURM_TIME_FORMAT=standard
  now                      2011-06-06T12:57:22
  yesterday 2pm            2011-06-05T14:00:00
  19 jan 1904 3:15         1904-01-19T03:15:00
  -2 days 4:15pm           2011-06-04T16:15:00
  tomorrow                 2011-06-07T12:57:22
  +2 days 2:17am           2011-06-08T02:17:00
  +3 days 2:18pm           2011-06-09T14:18:00
  -6 weeks                 2011-04-25T12:57:22
  +3 weeks + 10 days       2011-07-07T12:57:22
  next year                2012-06-06T12:57:22

  2) SLURM_TIME_FORMAT=relative
  now                                 12:57:22
  yesterday 2pm                   Ystday 14:00
  19 jan 1904 3:15                 19 Jan 1904
  -2 days 4:15pm                   4 Jun 16:15
  tomorrow                        Tomorr 12:57
  +2 days 2:17am                     Wed 02:17
  +3 days 2:18pm                     Thu 14:18src/common/parse_time.c
  -6 weeks                        25 Apr 12:57
  +3 weeks + 10 days               7 Jul 12:57
  next year                         6 Jun 2012

  3) SLURM_TIME_FORMAT="%a %T"
  now                             Mon 12:57:22
  yesterday 2pm                   Sun 14:00:00
  19 jan 1904 3:15                Tue 03:15:00
  -2 days 4:15pm                  Sat 16:15:00
  tomorrow                        Tue 12:57:22
  +2 days 2:17am                  Wed 02:17:00
  +3 days 2:18pm                  Thu 14:18:00
04_COSMETICS_context-dependent-timestring.diff Patch by Gerrit Renker, CSCS

03_COSMETICS_typos.diff from Gerrit Renker, CSCS

Now possible thanks to Danny's -rpath addition to the slurm build process.
02_Cray-simpler-munge-build-process.diff from Gerrit Renker, CSCS

This disables setting the kill command on Cray platforms, to ensure that
always either SIGHUP (interactive shells) or SIGTERM (all others) is sent.
Patch 01_Cray-salloc-no-kill-command.diff from Gerrit Renker, CSCS.

Did the actual fix for getting the correct information on clusters of any dimension size from accounting when querying against a hostlist

Added scontrol ability to increment or decrement a job or step time limit.

Modify the man2html calling sequence for a clean build of SLURM from the
source directory. The old code would copy the header.txt and footer.txt
files from "srcdir" to "." and generate an error if they were the same
files. The new code just passes the pathnames of the files into the
man2html python script

would not be set correctly in the added child association.

Add an configure option of --enable-salloc-kill-cmd which will
cause the salloc command to signal its child processes when the
job ends. Job signalling will be the default for Cray systems.
Jobs will not be signalled by default on other systems. SIGHUP
will be used for interactive jobs and SIGTERM will be used for
other jobs.