Skip to content
Snippets Groups Projects
Commit 33bef27f authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-15.08' into slurm-16.05

parents 372b7e06 b1d5df62
No related branches found
No related tags found
No related merge requests found
...@@ -2781,9 +2781,9 @@ extern int select_p_reconfigure(void) ...@@ -2781,9 +2781,9 @@ extern int select_p_reconfigure(void)
} else if (IS_JOB_SUSPENDED(job_ptr)) { } else if (IS_JOB_SUSPENDED(job_ptr)) {
/* add the job in a suspended state */ /* add the job in a suspended state */
if (job_ptr->priority == 0) if (job_ptr->priority == 0)
rc = _add_job_to_res(job_ptr, 1); (void) _add_job_to_res(job_ptr, 1);
else /* Gang schedule suspend */ else /* Gang schedule suspend */
rc = _add_job_to_res(job_ptr, 0); (void) _add_job_to_res(job_ptr, 0);
} else if (_job_cleaning(job_ptr)) { } else if (_job_cleaning(job_ptr)) {
cleaning_job_cnt++; cleaning_job_cnt++;
run_time = (int) difftime(now, job_ptr->end_time); run_time = (int) difftime(now, job_ptr->end_time);
......
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