Conflicts:
	Makefile.in
	auxdir/Makefile.in
	configure
	contribs/Makefile.in
	contribs/arrayrun/Makefile.in
	contribs/cray/Makefile.in
	contribs/lua/Makefile.in
	contribs/pam/Makefile.in
	contribs/perlapi/Makefile.in
	contribs/perlapi/libslurm/Makefile.in
	contribs/perlapi/libslurmdb/Makefile.in
	contribs/phpext/Makefile.in
	contribs/sjobexit/Makefile.in
	contribs/slurmdb-direct/Makefile.in
	contribs/torque/Makefile.in
	doc/Makefile.in
	doc/html/Makefile.in
	doc/man/Makefile.in
	etc/init.d.slurm
	src/Makefile.in
	src/api/Makefile.in
	src/common/Makefile.in
	src/database/Makefile.in
	src/db_api/Makefile.in
	src/plugins/Makefile.in
	src/plugins/accounting_storage/Makefile.in
	src/plugins/accounting_storage/common/Makefile.in
	src/plugins/accounting_storage/filetxt/Makefile.in
	src/plugins/accounting_storage/mysql/Makefile.in
	src/plugins/accounting_storage/none/Makefile.in
	src/plugins/accounting_storage/pgsql/Makefile.in
	src/plugins/accounting_storage/slurmdbd/Makefile.in
	src/plugins/auth/Makefile.in
	src/plugins/auth/authd/Makefile.in
	src/plugins/auth/munge/Makefile.in
	src/plugins/auth/none/Makefile.in
	src/plugins/checkpoint/Makefile.in
	src/plugins/checkpoint/aix/Makefile.in
	src/plugins/checkpoint/blcr/Makefile.in
	src/plugins/checkpoint/none/Makefile.in
	src/plugins/checkpoint/ompi/Makefile.in
	src/plugins/crypto/Makefile.in
	src/plugins/crypto/munge/Makefile.in
	src/plugins/crypto/openssl/Makefile.in
	src/plugins/gres/Makefile.in
	src/plugins/gres/gpu/Makefile.in
	src/plugins/gres/nic/Makefile.in
	src/plugins/job_submit/Makefile.in
	src/plugins/job_submit/cnode/Makefile.in
	src/plugins/job_submit/defaults/Makefile.in
	src/plugins/job_submit/logging/Makefile.in
	src/plugins/job_submit/lua/Makefile.in
	src/plugins/job_submit/partition/Makefile.in
	src/plugins/jobacct_gather/Makefile.in
	src/plugins/jobacct_gather/aix/Makefile.in
	src/plugins/jobacct_gather/linux/Makefile.in
	src/plugins/jobacct_gather/none/Makefile.in
	src/plugins/jobcomp/Makefile.in
	src/plugins/jobcomp/filetxt/Makefile.in
	src/plugins/jobcomp/mysql/Makefile.in
	src/plugins/jobcomp/none/Makefile.in
	src/plugins/jobcomp/pgsql/Makefile.in
	src/plugins/jobcomp/script/Makefile.in
	src/plugins/mpi/Makefile.in
	src/plugins/mpi/lam/Makefile.in
	src/plugins/mpi/mpich1_p4/Makefile.in
	src/plugins/mpi/mpich1_shmem/Makefile.in
	src/plugins/mpi/mpichgm/Makefile.in
	src/plugins/mpi/mpichmx/Makefile.in
	src/plugins/mpi/mvapich/Makefile.in
	src/plugins/mpi/none/Makefile.in
	src/plugins/mpi/openmpi/Makefile.in
	src/plugins/preempt/Makefile.in
	src/plugins/preempt/none/Makefile.in
	src/plugins/preempt/partition_prio/Makefile.in
	src/plugins/preempt/qos/Makefile.in
	src/plugins/priority/Makefile.in
	src/plugins/priority/basic/Makefile.in
	src/plugins/priority/multifactor/Makefile.in
	src/plugins/proctrack/Makefile.in
	src/plugins/proctrack/aix/Makefile.in
	src/plugins/proctrack/cgroup/Makefile.in
	src/plugins/proctrack/linuxproc/Makefile.in
	src/plugins/proctrack/lua/Makefile.in
	src/plugins/proctrack/pgid/Makefile.in
	src/plugins/proctrack/rms/Makefile.in
	src/plugins/proctrack/sgi_job/Makefile.in
	src/plugins/sched/Makefile.in
	src/plugins/sched/backfill/Makefile.in
	src/plugins/sched/builtin/Makefile.in
	src/plugins/sched/hold/Makefile.in
	src/plugins/sched/wiki/Makefile.in
	src/plugins/sched/wiki2/Makefile.in
	src/plugins/select/Makefile.in
	src/plugins/select/bluegene/Makefile.in
	src/plugins/select/bluegene/ba/Makefile.in
	src/plugins/select/bluegene/ba_bgq/Makefile.in
	src/plugins/select/bluegene/bl/Makefile.in
	src/plugins/select/bluegene/bl_bgq/Makefile.in
	src/plugins/select/bluegene/sfree/Makefile.in
	src/plugins/select/cons_res/Makefile.in
	src/plugins/select/cray/Makefile.in
	src/plugins/select/cray/libalps/Makefile.in
	src/plugins/select/cray/libemulate/Makefile.in
	src/plugins/select/linear/Makefile.in
	src/plugins/switch/Makefile.in
	src/plugins/switch/elan/Makefile.in
	src/plugins/switch/federation/Makefile.in
	src/plugins/switch/none/Makefile.in
	src/plugins/task/Makefile.in
	src/plugins/task/affinity/Makefile.in
	src/plugins/task/cgroup/Makefile.in
	src/plugins/task/none/Makefile.in
	src/plugins/topology/3d_torus/Makefile.in
	src/plugins/topology/Makefile.in
	src/plugins/topology/node_rank/Makefile.in
	src/plugins/topology/none/Makefile.in
	src/plugins/topology/tree/Makefile.in
	src/sacct/Makefile.in
	src/sacctmgr/Makefile.in
	src/salloc/Makefile.in
	src/sattach/Makefile.in
	src/sbatch/Makefile.in
	src/sbcast/Makefile.in
	src/scancel/Makefile.in
	src/scontrol/Makefile.in
	src/sinfo/Makefile.in
	src/slurmctld/Makefile.in
	src/slurmd/Makefile.in
	src/slurmd/common/Makefile.in
	src/slurmd/slurmd/Makefile.in
	src/slurmd/slurmstepd/Makefile.in
	src/slurmdbd/Makefile.in
	src/smap/Makefile.in
	src/sprio/Makefile.in
	src/squeue/Makefile.in
	src/sreport/Makefile.in
	src/srun/Makefile.am
	src/srun/Makefile.in
	src/srun_cr/Makefile.in
	src/sshare/Makefile.in
	src/sstat/Makefile.in
	src/strigger/Makefile.in
	src/sview/Makefile.in
	testsuite/Makefile.in
	testsuite/expect/Makefile.in
	testsuite/slurm_unit/Makefile.in
	testsuite/slurm_unit/api/Makefile.in
	testsuite/slurm_unit/api/manual/Makefile.in
	testsuite/slurm_unit/common/Makefile.in

Fixes a bunch of warnings of this type
warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body

In current version of slurm initscript, a stop action returns a
non null exit code as slurmstatus exit code is directly used and
the daemons are stopped.
Ensure that when called from slurmstop, slurmstatus error code is
reversed to correctly match the attended error code of the stop
stage.
Port of v2.4 commit a09bffa5
Matthieu Hautreux authored 3 months ag

Patch from Aleksej Saushev.

and that system had a smaller prefix than dimensions and only had one
node.  (i.e. bgq0000 would fall into this clause)  The dimensions in the
cluster_rec would not be set up correctly if this was the case.

CnodeCount/CnodeErrCount so to point out there are cnodes in an error state
on the block.  Draining the block and having it reboot when all jobs are
gone will clear up the cnodes in Software Failure.

for a long time after the SLURM job has been flushed from the system
we don't have to worry about rebooting the block to sync the system.

process when job is killed by scancel.

expired.

software error before.

updates.

state when already in error state.

sub-allocation steps of sub-block jobs.

blocks.

than your allocation.

are full allocation jobs, and others that are smaller.

Conflicts:
	src/slurmctld/node_scheduler.c

c0a7a7a4

fixed the problem

while jobs are running on them.

is a convenience function in BSD and glibc that internally calls
the equivalent of

    int masterfd = open("/dev/ptmx", flags);
    grantpt (masterfd);
    unlockpt (masterfd);
    int slavefd = open (slave, O_RDRW|O_NOCTTY);

(in psuedocode)

On Linux, with some combinations of glibc/kernel (in this
case glibc-2.14/Linux-3.1), the equivalent of grantpt(3) was failing
in slurmstepd with EPERM, because the allocated pty was getting
root ownership instead of the user running the slurm job.

From the POSIX description of grantpt:

 "The grantpt() function shall change the mode and ownership of the
  slave pseudo-terminal device... The user ID of the slave shall
  be set to the real UID of the calling process..."

 http://pubs.opengroup.org/onlinepubs/007904875/functions/grantpt.html

This means that for POSIX-compliance, the real user id of slurmstepd
must be the user executing the SLURM job at the time openpty(3) is
called. Unfortunately, the real user id of slurmstepd at this
point is still root, and only the effective uid is set to the user.

This patch is a work-around that uses the (non-portable) setresuid(2)
system call to reset the real and effective uids of the slurmstepd
process to the job user, but keep the saved uid of root. Then after
the openpty(3) call, the previous credentials are reestablished
using the same call.