[ARVADOS] updated: 250380dbdbac2f0a96f4a14d777a320dfdc62455

git at public.curoverse.com git at public.curoverse.com
Fri Jul 31 12:05:56 EDT 2015


Summary of changes:
 sdk/cli/test/binstub_sanity_check/{docker.io => docker} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sdk/cli/test/binstub_sanity_check/{docker.io => docker} (100%)

  discards  3e428f95590534844db8e67be1c204df5ebf274d (commit)
       via  250380dbdbac2f0a96f4a14d777a320dfdc62455 (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 (3e428f95590534844db8e67be1c204df5ebf274d)
            \
             N -- N -- N (250380dbdbac2f0a96f4a14d777a320dfdc62455)

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 250380dbdbac2f0a96f4a14d777a320dfdc62455
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 31 12:05:26 2015 -0400

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

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
-- 




More information about the arvados-commits mailing list