Conflicts:
	src/srun/libsrun/opt.c

and perhaps someone might find it useful).

One change is a check was added to see if Limits are enforced before
doing any of the work.  Before it wasn't part of the mix so some jobs
could get killed if limits were enforced and then turned off.

enforcing a QOS doesn't have anything to do with enforcing a limit if a
QOS is used.

Signed-off-by: Danny Auble <da@schedmd.com>

running the perf profiler on slurmctld on our production cluster (with select/cons_res) showed that with our configuration & workload highest up in the profile are calls to difftime() and _cr_job_list_sort(), in total accounting for ~37% of the total runtime.

By sacrificing some theoretical portability by replacing the calls to difftime() with a simple inline subtraction that 37% should be substantially reduced.

As I saw identical code also in the linear and serial plugins, I fixed those in the same manner, although I don't know if this performance issue turns up when using those plugins.

Conflicts:
	NEWS
	configure
	doc/html/cray.shtml

than BGQ.

Remove some unused variables and minor reformatting to conform
with Linux kernel coding standard

aprun process instead of a perl script.

Conflicts:
	configure
	doc/html/documentation.shtml
	src/common/cpu_frequency.c
	src/common/slurm_jobacct_gather.c
	src/common/slurm_protocol_defs.c
	src/common/slurm_protocol_defs.h
	src/plugins/accounting_storage/mysql/as_mysql_job.c
	src/sstat/sstat.c

The patch contains:
1) general code cleanup
2) documentation concerning the energy framework
3) fix for sstat header/data mismatch problem
4) changes on the rapl plugin to print the average power consumption between 2 measurements
in place of an instantaneous value:  this is printed for CurrentWatts value of "scontrol show node"
5)the memory leak that Moe located on cpu frequency code

we are currently working on the following :
- the requested frequency as described by Martin
- rapl fine grain measurements (socket level)
- the ipmi plugin based on freeipmi

and we hope to have them either during your 2.5.0.rc1 testing period or for the 2.5.1