Conflicts:
	src/common/read_config.c

BUG #1149

the SelectTypeParameters to magically set to CR_CPU.

definitions needed for drmaa.

Conflicts:
	src/plugins/select/alps/cray_config.h

did the ALPS reservation.  Bug 1115

You can find attached a patch that make hwloc, freeipmi, ofed and rrdtool autoconf macros honor the --without-rpath flag when set, like munge and bluegene macros already do.

instead of 8.

The spank_fini() function is registered with atexit() to be called
after termination of the srun main() function. The registered
functions are inherited by the forked shepard process and thus
spank_fini() is called twice.
This commit fixes this problem by introducing a wrapper function
_call_spank_fini() that is a no-op in the context of the shepard
process.

Take more job options into consideration to estimate its node count.

the Slurm database.

Avoid integer overflow on platforms with 32bit suseconds_t.

At work in Sweden we often fika (coffee+buns and what have u) at 3PM. I sometimes accidentally give a start time of 'teatime', so when I return from 'fika' I see my job's just getting started. This fix should make life even easier for the Swedes.