Skip to content
Snippets Groups Projects
Commit 606ad6d5 authored by Danny Auble's avatar Danny Auble
Browse files

Merge remote-tracking branch 'origin/slurm-15.08' into slurm-16.05

parents 687aea33 24ff890f
No related branches found
No related tags found
No related merge requests found
......@@ -235,6 +235,7 @@ documents those changes that are of interest to users and administrators.
-- Perlapi - Remove unneeded/undefined mutex.
-- Fix issue when TopologyParam=NoInAddrAny is set the responses wouldn't
make it to the slurmctld when using message aggregation.
-- MySQL - Fix potential memory leak when rolling up data.
* Changes in Slurm 15.08.11
===========================
......
......@@ -310,8 +310,10 @@ static void _add_tres_2_list(List tres_list, char *tres_str, int seconds)
/* This will destroy the *loc_tres given after it is transfered */
static void _transfer_loc_tres(List *loc_tres, local_id_usage_t *usage)
{
if (!usage)
if (!usage) {
FREE_NULL_LIST(*loc_tres);
return;
}
if (!usage->loc_tres) {
usage->loc_tres = *loc_tres;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment