diff --git a/NEWS b/NEWS
index ea61eef56072c43a7c996cb6d5a08a43b51357f8..84cf8a7fe192ab5e3c85654ebfe931df42b03861 100644
--- a/NEWS
+++ b/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
 ==========================
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index b8d599bfc3a811e50647190fb921ea69b599785e..02dae55a62be0e5da65de2b5c25c04027fc73c9d 100644
--- a/doc/html/team.shtml
+++ b/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>
diff --git a/src/plugins/select/alps/libalps/basil_mysql_routines.c b/src/plugins/select/alps/libalps/basil_mysql_routines.c
index 0261426e4618151a44412fa79c7236ca675460f8..174b3551c0d2e350871d5e812c3cad3b7233a167 100644
--- a/src/plugins/select/alps/libalps/basil_mysql_routines.c
+++ b/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",