diff --git a/NEWS b/NEWS index 608c733050eb352339eaf61cf754274837deac0e..73f859fd18e7465b77887549618f128c49ae36a5 100644 --- a/NEWS +++ b/NEWS @@ -189,6 +189,9 @@ documents those changes that are of interest to users and admins. -- When a job dependency can never be satisfied do not cancel the job but keep pending with reason WAIT_DEP_INVALID (DependencyNeverSatisfied). +* Changes in Slurm 14.03.8 +========================== + * Changes in Slurm 14.03.7 ========================== -- Correct typos in man pages. diff --git a/doc/html/slurm_ug_agenda.shtml b/doc/html/slurm_ug_agenda.shtml index 267c4aeec0a04423ed795522954c3fcf4929c9e3..d916f1907a5027a664a431b74fc8dd6ab6e40d07 100644 --- a/doc/html/slurm_ug_agenda.shtml +++ b/doc/html/slurm_ug_agenda.shtml @@ -23,7 +23,7 @@ Convention Centre Lugano</a>, Lugano, Switzerland.</p> <p>The conference cost is $350 per person for registration by 23 August and $400 per person for late registration. This includes presentations, tutorials, lunch and snacks on both days, -plus dinner on Wednesday evening.<br> +plus dinner on Tuesday evening.<br> <a href="https://www.eventbrite.com/e/slurm-user-group-meeting-2014-tickets-12322056603">Register here</a>.</p> @@ -53,7 +53,7 @@ plus dinner on Wednesday evening.<br> <tr> <td>08:30 - 08:40</td> <td>Welcome</td> - <td>TBD (CSCS)</td> + <td>Colin McMurtrie (CSCS)</td> <td>Welcome to Slurm User Group Meeting</td> </tr> @@ -865,6 +865,6 @@ and involved in several research challenges of the European Human Brain Project. system to dynamically allocate disk space on our test high-IOPS SSD scratch system.</p> -<p style="text-align:center;">Last modified 29 July 2014</p> +<p style="text-align:center;">Last modified 19 August 2014</p> <!--#include virtual="footer.txt"--> diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c index 49ab5d3de6e6c21b4850949fab96cd21d4bc79dd..9a3b5dc3c9e11d063ef5b2a8eefa95ed40439306 100644 --- a/src/slurmctld/reservation.c +++ b/src/slurmctld/reservation.c @@ -3808,7 +3808,7 @@ extern int job_test_resv(struct job_record *job_ptr, time_t *when, if (slurmctld_conf.debug_flags & DEBUG_FLAG_RESERVATION) { char *nodes = bitmap2node_name(*node_bitmap); info("job_test_resv: job:%u reservation:%s nodes:%s", - job_ptr->job_id, nodes, job_ptr->resv_name); + job_ptr->job_id, job_ptr->resv_name, nodes); xfree(nodes); }