diff --git a/CHANGELOG b/CHANGELOG index 82b5eb6..a50eb78 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Maui 3.2.6p14 Features + - Fixed bug with floating generic resource tracking - Added support for NODEMEMOVERCOMMITFACTOR on TORQUE - Integrated latest DOE S3 communications library - Cleaned up showconfig output diff --git a/include/msched-version.h b/include/msched-version.h index ab49c54..4939fa0 100644 --- a/include/msched-version.h +++ b/include/msched-version.h @@ -1 +1 @@ -#define MSCHED_VERSION "maui-3.2.6p14-snap.1130608625" +#define MSCHED_VERSION "maui-3.2.6p14-snap.1131673836" diff --git a/src/moab/MJob.c b/src/moab/MJob.c index 7b40e9a..15197b6 100644 --- a/src/moab/MJob.c +++ b/src/moab/MJob.c @@ -9628,7 +9628,7 @@ int MJobGetNRange( } else { - if (N->RM->Type == mrmtLL) + if ((N->RM != NULL) && (N->RM->Type == mrmtLL)) { if (RQ->NodeCount > 0) {