1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #36424 from liubin/fix-typo

Fix typos in builder and client
This commit is contained in:
Vincent Demeester 2018-02-27 10:24:20 +01:00 committed by GitHub
commit 5b124d7422
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -9,7 +9,7 @@ import (
"github.com/docker/docker/api/types/strslice" "github.com/docker/docker/api/types/strslice"
) )
// KeyValuePair represent an arbitrary named value (useful in slice insted of map[string] string to preserve ordering) // KeyValuePair represent an arbitrary named value (useful in slice instead of map[string] string to preserve ordering)
type KeyValuePair struct { type KeyValuePair struct {
Key string Key string
Value string Value string
@ -195,7 +195,7 @@ func (c *WorkdirCommand) Expand(expander SingleWordExpander) error {
return nil return nil
} }
// ShellDependantCmdLine represents a cmdline optionaly prepended with the shell // ShellDependantCmdLine represents a cmdline optionally prepended with the shell
type ShellDependantCmdLine struct { type ShellDependantCmdLine struct {
CmdLine strslice.StrSlice CmdLine strslice.StrSlice
PrependShell bool PrependShell bool

View file

@ -248,7 +248,7 @@ func TestNegotiateAPIVersion(t *testing.T) {
} }
// TestNegotiateAPIVersionOverride asserts that we honor // TestNegotiateAPIVersionOverride asserts that we honor
// the environment variable DOCKER_API_VERSION when negotianing versions // the environment variable DOCKER_API_VERSION when negotiating versions
func TestNegotiateAPVersionOverride(t *testing.T) { func TestNegotiateAPVersionOverride(t *testing.T) {
expected := "9.99" expected := "9.99"
defer env.PatchAll(t, map[string]string{"DOCKER_API_VERSION": expected})() defer env.PatchAll(t, map[string]string{"DOCKER_API_VERSION": expected})()