diff --git a/NEWS b/NEWS
index 463d83ddf51361feccdedbb5e5969c6f7bf769c5..20904d7a80cda65dd9c781787af2b08a283f3e59 100644
--- a/NEWS
+++ b/NEWS
@@ -241,6 +241,7 @@ documents those changes that are of interest to users and administrators.
-- FrontEnd - ping non-responding or down nodes.
-- switch/cray: If CR_PACK_NODES is configured, then set the environment
variable "PMI_CRAY_NO_SMP_ENV=1"
+ -- Fix invalid memory reference in SlurmDBD when putting a node up.
* Changes in Slurm 14.11.5
==========================
diff --git a/doc/html/accounting.shtml b/doc/html/accounting.shtml
index ec3131358f6a8ecf2f59230628d2a588823bfe62..f78ff6d55018da7c092f8224c5f41510bf9f3193 100644
--- a/doc/html/accounting.shtml
+++ b/doc/html/accounting.shtml
@@ -114,6 +114,8 @@ If you plan to restrict access to accounting records (e.g.
only permit a user to view records of his jobs), then all
users should have consistent names and IDs.</p>
+<p><b>NOTE:</b> Only lowercase usernames are supported.
+
<p>The best way to insure security of the data is by authenticating
communications to the SlurmDBD and we recommend
<a href="https://code.google.com/p/munge/">MUNGE</a> for that purpose.
@@ -202,12 +204,33 @@ checking for mysql_config... /usr/bin/mysql_config
MySQL test program built properly.
</pre>
-<p>Note that at least the first time running the slurmdbd with MySQL you need
-to make sure your my.cnf file has innodb_buffer_pool_size equal to at least 64
-megabytes. You can accomplish this by adding the line:<br>
-<i>innodb_buffer_pool_size=64M</i><br>
-under the [mysqld] reference in the my.cnf file and restarting the mysqld.
-This is needed when converting large tables over to the new database schema.</p>
+<p><b>NOTE:</b> Before running the slurmdbd for the first time, review the
+current setting for MySQL's
+<a href="http://dev.mysql.com/doc/refman/5.0/en/innodb-parameters.html
+#sysvar_innodb_buffer_pool_size">innodb_buffer_pool_size</a>.
+Consider setting this
+value large enough to handle the size of the database. This helps when
+converting large tables over to the new database schema and when purging
+old records.</p>
+
+<p>
+ex.
+<pre>
+mysql> SHOW VARIABLES LIKE 'innodb_buffer_pool_size';
++-------------------------+-----------+
+| Variable_name | Value |
++-------------------------+-----------+
+| innodb_buffer_pool_size | 134217728 |
++-------------------------+-----------+
+1 row in set (0.00 sec)
+
+$cat my.cnf
+...
+[mysqld]
+<i>innodb_buffer_pool_size=128M</i>
+...
+</pre>
+</p>
<h2>Slurm Accounting Configuration After Build</h2>
@@ -788,7 +811,7 @@ as deleted.
If an entity has existed for less than 1 day, the entity will be removed
completely. This is meant to clean up after typographic errors.</p>
-<p style="text-align:center;">Last modified 30 April 2014</p>
+<p style="text-align:center;">Last modified 6 April 2015</p>
<!--#include virtual="footer.txt"-->
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index 981cbd748ef0c2e4295e1bd59b5078b593e6e70b..c71c944e86967040fee140e21ab85ef5d626dbca 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -84,6 +84,7 @@ Lead Slurm developers are:
<li>Josh England (TGS Management Corporation)</li>
<li>Kent Engström (National Supercomputer Centre, Sweden)</li>
<br>
+<li>Roland Fehrenbacher (Q-Leap Networks, Germany)</li>
<li>Carles Fenoy (Barcelona Supercomputing Center, Spain)</li>
<li>Broi Franco (ION)</li>
<li>Damien François (Université catholique de Louvain, Belgium)</li>
diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1
index 93b593b594e4ec26a8d5cce85b04592e80b0511e..d43d528e0ef4694deaab3b7dacc9a5addc66d82c 100644
--- a/doc/man/man1/sacctmgr.1
+++ b/doc/man/man1/sacctmgr.1
@@ -224,7 +224,7 @@ List of transactions that have occurred during a given time period.
.TP
\fIuser\fR
-The login name.
+The login name. Only lowercase usernames are supported.
.TP
\fIwckeys\fR
diff --git a/src/plugins/proctrack/lua/proctrack_lua.c b/src/plugins/proctrack/lua/proctrack_lua.c
index 737decad9c02c2e66eb33a3d8c58b7a7863b0f0c..3c6423009d028a7f03f634f6224258705a2ff2a9 100644
--- a/src/plugins/proctrack/lua/proctrack_lua.c
+++ b/src/plugins/proctrack/lua/proctrack_lua.c
@@ -231,8 +231,12 @@ int init (void)
* by any lua scripts.
*/
if (!dlopen("liblua.so", RTLD_NOW | RTLD_GLOBAL) &&
- !dlopen("liblua5.1.so", RTLD_NOW | RTLD_GLOBAL) &&
- !dlopen("liblua5.1.so.0", RTLD_NOW | RTLD_GLOBAL)) {
+ !dlopen("liblua-5.2.so", RTLD_NOW | RTLD_GLOBAL) &&
+ !dlopen("liblua5.2.so", RTLD_NOW | RTLD_GLOBAL) &&
+ !dlopen("liblua5.2.so.0", RTLD_NOW | RTLD_GLOBAL) &&
+ !dlopen("liblua-5.1.so", RTLD_NOW | RTLD_GLOBAL) &&
+ !dlopen("liblua5.1.so", RTLD_NOW | RTLD_GLOBAL) &&
+ !dlopen("liblua5.1.so.0", RTLD_NOW | RTLD_GLOBAL)) {
return (error("Failed to open liblua.so: %s", dlerror()));
}
diff --git a/src/slurmdbd/proc_req.c b/src/slurmdbd/proc_req.c
index e891c2e6c059df061becc8d30b7b2c04b3c17844..4ca1189cc3634cb78a75e9cac17f9095bf6b891a 100644
--- a/src/slurmdbd/proc_req.c
+++ b/src/slurmdbd/proc_req.c
@@ -2588,10 +2588,15 @@ static int _node_state(slurmdbd_conn_t *slurmdbd_conn,
_node_state_string(node_state_msg->new_state),
node_state_msg->reason,
(long)node_state_msg->event_time);
+ /* clusteracct_storage_g_node_up can change the reason
+ * field so copy it to avoid memory issues.
+ */
+ node_ptr.reason = xstrdup(node_state_msg->reason);
rc = clusteracct_storage_g_node_up(
slurmdbd_conn->db_conn,
&node_ptr,
node_state_msg->event_time);
+ xfree(node_ptr.reason);
} else {
debug2("DBD_NODE_STATE: NODE:%s STATE:%s "
"REASON:%s UID:%u TIME:%ld",