Conflicts:
	META
	NEWS

constraints mattered in a job.

    Details include:
    A job doesn't request memory but the system is running
    with CR_*MEMORY with no default memory limit and the job requests nodes
    with features of different sizes.  Previously the order of constraints
    mattered where the smaller memory node would need to be requested first
    or the job would fail.

    Bug 2608

This reverts commit f559a55c.

constraints mattered in a job.

Details include:
A job doesn't request memory but the system is running
with CR_*MEMORY with no default memory limit and the job requests nodes
with features of different sizes.  Previously the order of constraints
mattered where the smaller memory node would need to be requested first
or the job would fail.

Bug 2608

Previous logic would get an account and/or QOS time limit and use
  that value to overwrite the incoming RPC's NO_VAL value, which
  would change a job's time limit when changing an unrelated
  field (e.g. priority, QOS, etc.).
bug 2610

Prevent use of NULL pointer and SEGV when changing a job's QOS when
  the slurmdbd is not configured.

bug 2609

These tests failed with MinJobAge=3, so when the tests looked for
  completed jobs, the job records had already been purged. Log this
  configuration as a possible reason for failure.

Conflicts:
	src/plugins/sched/backfill/backfill.c

Fix backfill scheduler race condition that could cause invalid pointer in
    select/cons_res plugin. Bug introduced in 15.08.9, commit:
    efd9d35e

The scenario is as follows
1. Backfill scheduler is running, then releases locks
2. Main scheduling loop starts a job "A"
3. Backfill scheduler resumes, finds job "A" in its queue and
   resets it's partition pointer.
4. Job "A" completes and tries to remove resource allocation record
   from select/cons_res data structure, but fails to find it because
   it is looking in the table for the wrong partition.
5. Job "A" record gets purged from slurmctld
6. Select/cons_res plugin attempts to operate on resource allocation
   data structure, finds pointer into the now purged data structure
   of job "A" and aborts or gets SEGV
Bug 2603

misleading.

instead of ID to make things easier to read.

# Conflicts:
#	src/common/gres.c

canceled while launching.

Rather than making sure that a running job's socket count on a
  node remain constant, just make sure the total core count
  remains constant.

Rename partition configuration from "Shared" to "OverSubscribe". Rename
    salloc, sbatch, srun option from "--shared" to "--oversubscribe". The old
    options will continue to function. Output field names also changed in
    scontrol, sinfo, squeue, and sview.

Power/cray: Don't specify NID list to Cray APIs. If any of those nodes are
    not in a ready state, the API returned an error for ALL nodes rather than
    valid data for nodes in ready state.
bug 2332

and retries are done making the error message a little misleading.

Update a node's socket and cores per socket counts as needed after a node
    boot to reflect configuration changes which can occur on KNL processors.
    Note that the node's total core count must not change, only the distribution
    of cores across varying socket counts (KNL NUMA nodes treated as sockets by
    Slurm).

Log if the number of cores is not evenly divisible by the socket
  count (which will be the case on some KNL) or the number of
  threads is not evenly divisible by the core count.