diff --git a/NEWS b/NEWS index 4265d11f6540c22b83331ec137bea623daed92a9..60218fd925a42cf3db43f55b723d10aad2bc32fa 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,8 @@ documents those changes that are of interest to users and admins. processor count although the memory and disk space configuration can be loaded from the compute node when it starts. -- Add configure option "--disable-iso8601" to disable SLURM use of ISO 8601 - time format at the time of SLURM build. + time format at the time of SLURM build. Default output for all commands + is now ISO 8601 (yyyy-mm-ddThh:mm:ss). * Changes in SLURM 1.4.0-pre6 ============================= diff --git a/src/common/parse_time.c b/src/common/parse_time.c index 879c8d1f0aa9ec8870746153fa0df8f5d7f2b782..114e56153fd3df8dd54171a4094911b7a7e68717 100644 --- a/src/common/parse_time.c +++ b/src/common/parse_time.c @@ -35,6 +35,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \*****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <stdio.h> #include <time.h> #include <strings.h> @@ -448,7 +452,7 @@ slurm_make_time_str (time_t *time, char *string, int size) if ( *time == (time_t) 0 ) { snprintf(string, size, "Unknown"); } else { -#ifdef ISO8601 +#ifdef USE_ISO_8601 /* Format YYYY-MM-DDTHH:MM:SS, ISO8601 standard format, * NOTE: This is expected to break Maui, Moab and LSF * schedulers management of SLURM. */