From 1d62807db3bcbb3d793a5bb396d17aa62a59537c Mon Sep 17 00:00:00 2001 From: xichengliudui <1693291525@qq.com> Date: Tue, 26 Feb 2019 13:50:04 -0500 Subject: [PATCH] Delete duplicate words MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit update pull request Signed-off-by: “xichengliudui” <“liuduidui@beyondcent.com”> --- client/client.go | 2 +- hack/ci/windows.ps1 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/client.go b/client/client.go index f174d3ce71..0b7b4d953c 100644 --- a/client/client.go +++ b/client/client.go @@ -87,7 +87,7 @@ type Client struct { // If the request is non-GET return `ErrRedirect`. Otherwise use the last response. // // Go 1.8 changes behavior for HTTP redirects (specifically 301, 307, and 308) in the client . -// The Docker client (and by extension docker API client) can be made to to send a request +// The Docker client (and by extension docker API client) can be made to send a request // like POST /containers//start where what would normally be in the name section of the URL is empty. // This triggers an HTTP 301 from the daemon. // In go 1.8 this 301 will be converted to a GET request, and ends up getting a 404 from the daemon. diff --git a/hack/ci/windows.ps1 b/hack/ci/windows.ps1 index 290a0143c3..c2c937f4cb 100644 --- a/hack/ci/windows.ps1 +++ b/hack/ci/windows.ps1 @@ -374,7 +374,7 @@ Try { Write-Host -ForegroundColor Green "---------------------------------------------------------------------------" Write-Host -ForegroundColor Green " Failed to get a response from the control daemon. It may be down." Write-Host -ForegroundColor Green " Try re-running this CI job, or ask on #docker-maintainers on docker slack" - Write-Host -ForegroundColor Green " to see if the the daemon is running. Also check the service configuration." + Write-Host -ForegroundColor Green " to see if the daemon is running. Also check the service configuration." Write-Host -ForegroundColor Green " DOCKER_HOST is set to $DOCKER_HOST." Write-Host -ForegroundColor Green "---------------------------------------------------------------------------" Write-Host @@ -554,7 +554,7 @@ Try { $env:GOROOT="$env:TEMP\go" Write-Host -ForegroundColor Green "INFO: $(go version)" - # Work out the the -H parameter for the daemon under test (DASHH_DUT) and client under test (DASHH_CUT) + # Work out the -H parameter for the daemon under test (DASHH_DUT) and client under test (DASHH_CUT) #$DASHH_DUT="npipe:////./pipe/$COMMITHASH" # Can't do remote named pipe #$ip = (resolve-dnsname $env:COMPUTERNAME -type A -NoHostsFile -LlmnrNetbiosOnly).IPAddress # Useful to tie down $DASHH_CUT="tcp://127.0.0.1`:2357" # Not a typo for 2375! @@ -813,7 +813,7 @@ Try { if ($null -ne $env:INTEGRATION_IN_CONTAINER) { Write-Host -ForegroundColor Green "INFO: Integration tests being run inside a container" # Note we talk back through the containers gateway address - # And the ridiculous lengths we have to go to to get the default gateway address... (GetNetIPConfiguration doesn't work in nanoserver) + # And the ridiculous lengths we have to go to get the default gateway address... (GetNetIPConfiguration doesn't work in nanoserver) # I just could not get the escaping to work in a single command, so output $c to a file and run that in the container instead... # Not the prettiest, but it works. $c | Out-File -Force "$env:TEMP\binary\runIntegrationCLI.ps1"