Conflicts:
	src/slurmctld/acct_policy.c

cluster(s) requested.

Bug 1492

For job running under a debugger, if the exec of the task fails, then
cancel its I/O and abort immediately rather than waiting 60 seconds for
I/O timeout.

The option has not been functional or documented since Slurm version 2.0.

This controls how long a requeued job must wait before it can
restart, and 20 minutes is too long in most cases. Administrators
can alter this configuration parameter if needed in case of slow
Prolog or the like.

Conflicts:
	src/slurmctld/job_mgr.c

Add missing arguments to slurm_sched_p_newalloc/slurm_sched_p_freealloc
documentation.

Use this to specify the lifetime of a job step credential.

Bug 1476

Set the delay time for job requeue to the job credential lifetime (1200
second by default). This insures that prolog runs on every node when a
job is requeued. (This change will slow down launch of re-queued jobs).
Without this change, if a job is restated within 1200 seconds, the nodes
previously used would not run the prolog again, since the job ID is
still seen as active (from the previous execution). It is also advisable
to set the value of DEFAULT_EXPIRATION_WINDOW in src/common/slurm_cred.c
to the lowest value reasonable. We need to add a new configuration parameter
so this is easly changed in the future.

Conflicts:
	src/slurmctld/job_mgr.c

Display job's estimated NodeCount based off of partition's configured resources rather than the whole system's.

Bug 1478

This provides a better global view of what the limits and caps are.

Remove time from "capmc get_node_energy_counter" call. If no recent
  data is available, no data is being returned, so just get latest
  information.
Initialize a variable to avoid xfree of uninitialized variable.
Correct joule to watt calculation (">" changed to "<")
Read configuration once when slurmctld starts rather than twice
Compute a node's power consumption with more precision based upon
  time to the microsecond

Add links to burst buffer and power management pages.
Add JSON-C build/installation instructions.

Previously, there was no binding of tasks to the appropriate NUMA.
Based upon work by Josko Plazonic <plazonic@princeton.edu>.

Improved logging and some code restructuring. No change in logic.

This reverts commit e24a418b.

Improved logging and some code restructuring. No change in logic.

Mail notifications on job BEGIN, END and FAIL now apply to a job array as a
whole rather than generating individual email messages for each task in the
job array.

This reverts commit e24a418b.