Merge branch 'slurm-14.11'

NEWS

@@ -153,6 +153,7 @@ documents those changes that are of interest to users and administrators.
  -- Fix wrong variables used in the wrapper functions needed for systems that
     don't support strong_alias
  -- Fix code for apple computers SOL_TCP is not defined
+ -- Cray/BASIL - Check for mysql credentials in /root/.my.cnf.
 
 * Changes in Slurm 14.11.4
 ==========================

doc/html/team.shtml

@@ -196,6 +196,7 @@ Lead Slurm developers are:
 <li>Marcin Stolarek</li>
 <li>Tyler Strickland (University of Florida)</li>
 <li>Jeff Squyres (LAM MPI)</li>
+<li>Nina Suvanphim (Cray)</li>
 <br>
 <li>Prashanth Tamraparni (HP, India)</li>
 <li>Jimmy Tang (Trinity College, Ireland)</li>

src/plugins/select/alps/libalps/basil_mysql_routines.c

@@ -14,6 +14,7 @@ static int cray_get_options_from_default_conf(MYSQL *handle)
 	 * Hardcoded list of paths my.cnf is known to exist on a Cray XT/XE
 	 */
 	const char *default_conf_paths[] = {
+		"/root/.my.cnf",
 		"/etc/my.cnf",
 		"/etc/opt/cray/MySQL/my.cnf",
 		"/etc/mysql/my.cnf",