Improve PAM installation description in the FAQ
jobcomp/mysql - Fix smallint to int for uid/gid
Avoid uninitialized variable error
Merge remote-tracking branch 'origin/slurm-2.6'
Fix Typecasting issues
use slurm_atoul instead of atoi
Clarify meaning of CPU in a FAQ
job_submit/lua - add cpus_per_task field

bug 511
CRAY - Fix default issue
CRAY - make sview work on a native cray
Add support for node UNDRAIN

Add ability to clear a node's DRAIN flag using scontrol or sview by setting
it's state to "UNDRAIN". The node's base state (e.g. "DOWN" or "IDLE") will
not be changed.
bug 514
Clarify meaning of CPU in a FAQ
job_submit/lua - add cpus_per_task field

bug 511
DefMemPerCPU=UNLIMITED and MaxMemPerCPU=UNLIMITED when these
limits are configured as 0.
mpirun-mic - Major re-write for Xeon Phi use.
Added new configuration parameter AuthInfo
Fix to backfill scheduling for 32-bit task array index

Logic in backfill scheduler did not change when array_task_id
was changed from 16 to 32-bit
Add to contributor list
document performance issue for shared=yes|force

The time/resource allocation matrix is rebuilt on each job
exit, which severely impacts performance at large counts of
running jobs (say >10k jobs).
Merge branch 'slurm-2.6'

Conflicts:
	doc/html/faq.shtml