[ARVADOS] updated: 147d27f6b4b68d9fd71fc81f967385816e850ebf

[git at public.curoverse.com]

Summary of changes:
 doc/install/install-crunch-dispatch.html.textile.liquid | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

  discards  250380dbdbac2f0a96f4a14d777a320dfdc62455 (commit)
       via  147d27f6b4b68d9fd71fc81f967385816e850ebf (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (250380dbdbac2f0a96f4a14d777a320dfdc62455)
            \
             N -- N -- N (147d27f6b4b68d9fd71fc81f967385816e850ebf)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 147d27f6b4b68d9fd71fc81f967385816e850ebf
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 31 12:07:34 2015 -0400

    6838: Change default docker executable from docker.io to docker.

diff --git a/doc/install/install-crunch-dispatch.html.textile.liquid b/doc/install/install-crunch-dispatch.html.textile.liquid
index 46ce042..541d253 100644
--- a/doc/install/install-crunch-dispatch.html.textile.liquid
+++ b/doc/install/install-crunch-dispatch.html.textile.liquid
@@ -140,8 +140,8 @@ export ARVADOS_API_HOST={{ site.arvados_api_host }}
 export CRUNCH_DISPATCH_LOCKFILE=/var/lock/crunch-dispatch
 
 # This is the path to docker on your compute nodes. You might need to
-# change it to "docker", "/opt/bin/docker", etc.
-export CRUNCH_JOB_DOCKER_BIN=docker.io
+# change it to "docker.io", "/opt/bin/docker", etc.
+export CRUNCH_JOB_DOCKER_BIN=docker
 
 fuser -TERM -k $CRUNCH_DISPATCH_LOCKFILE || true
 
diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 13001e7..589a6ed 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -126,7 +126,7 @@ my $jobspec;
 my $job_api_token;
 my $no_clear_tmp;
 my $resume_stash;
-my $docker_bin = "docker.io";
+my $docker_bin = "docker";
 GetOptions('force-unlock' => \$force_unlock,
            'git-dir=s' => \$git_dir,
            'job=s' => \$jobspec,
diff --git a/sdk/cli/test/binstub_sanity_check/docker.io b/sdk/cli/test/binstub_sanity_check/docker
similarity index 100%
rename from sdk/cli/test/binstub_sanity_check/docker.io
rename to sdk/cli/test/binstub_sanity_check/docker

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


hooks/post-receive
--