From fbe880b70118f21323cd6f96ef1c8a9537d12e2e Mon Sep 17 00:00:00 2001 From: Moe Jette <jette1@llnl.gov> Date: Wed, 8 Dec 2010 15:55:59 +0000 Subject: [PATCH] svn merge -r21639:21718 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1 --- src/salloc/opt.c | 2 +- src/sbatch/opt.c | 2 +- src/srun/opt.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/salloc/opt.c b/src/salloc/opt.c index 35a832f83f5..b800c88a396 100644 --- a/src/salloc/opt.c +++ b/src/salloc/opt.c @@ -1762,7 +1762,7 @@ static void _help(void) "\n" "Parallel run options:\n" " -A, --account=name charge job to specified account\n" -" --begin=time defer job until HH:MM DD/MM/YY\n" +" --begin=time defer job until HH:MM MM/DD/YY\n" " --bell ring the terminal bell when the job is allocated\n" " -c, --cpus-per-task=ncpus number of cpus required per task\n" " --comment=name arbitrary comment\n" diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c index b636cc50020..8d02f96a5d9 100644 --- a/src/sbatch/opt.c +++ b/src/sbatch/opt.c @@ -2714,7 +2714,7 @@ static void _help(void) "\n" "Parallel run options:\n" " -A, --account=name charge job to specified account\n" -" --begin=time defer job until HH:MM DD/MM/YY\n" +" --begin=time defer job until HH:MM MM/DD/YY\n" " -c, --cpus-per-task=ncpus number of cpus required per task\n" " --comment=name arbitrary comment\n" " -d, --dependency=type:jobid defer job until condition on jobid is satisfied\n" diff --git a/src/srun/opt.c b/src/srun/opt.c index c15b94e3908..d8898103f62 100644 --- a/src/srun/opt.c +++ b/src/srun/opt.c @@ -2289,7 +2289,7 @@ static void _help(void) "\n" "Parallel run options:\n" " -A, --account=name charge job to specified account\n" -" --begin=time defer job until HH:MM DD/MM/YY\n" +" --begin=time defer job until HH:MM MM/DD/YY\n" " -c, --cpus-per-task=ncpus number of cpus required per task\n" " --checkpoint=time job step checkpoint interval\n" " --checkpoint-dir=dir directory to store job step checkpoint image \n" -- GitLab