[ARVADOS] updated: 50b696969d71739e9fd083664de6a81db7e211b3

[Git user]

Summary of changes:
 sdk/cli/bin/crunch-job | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

       via  50b696969d71739e9fd083664de6a81db7e211b3 (commit)
       via  a673edc3450f2acee47e811a6197a6eb087ee275 (commit)
       via  faf5328304cd7c0b3ec1669c6f7f18c3f4daf25c (commit)
      from  f82ee19a440e31f05381511cf6c0d7932d804b9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 50b696969d71739e9fd083664de6a81db7e211b3
Merge: f82ee19 a673edc
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Sep 13 10:05:09 2016 -0400

    Merge branch '9924-revoked-working-slots' closes #9924


commit a673edc3450f2acee47e811a6197a6eb087ee275
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Sep 13 10:04:43 2016 -0400

    9924: Tweak comment and remove superfluous variable assignment.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 0ad5a6b..7584d3a 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -1511,11 +1511,10 @@ sub preprocess_stderr
     Log ($jobstepidx, "stderr $line");
     if ($line =~ /srun: error: (SLURM job $ENV{SLURM_JOB_ID} has expired|Unable to confirm allocation for job $ENV{SLURM_JOB_ID})/) {
       # If the allocation is revoked, we can't possibly continue, so mark all
-      # slots as failed.  This will cause the overall exit code to be
+      # nodes as failed.  This will cause the overall exit code to be
       # EX_RETRY_UNLOCKED instead of failure so that crunch_dispatch can re-run
-      # this job.  whoa.
+      # this job.
       $main::please_freeze = 1;
-      $working_slot_count = 0;
       foreach my $st (@slot) {
         $st->{node}->{fail_count}++;
       }

-----------------------------------------------------------------------


hooks/post-receive
--