docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #648 from liubin/fixtypos 

fix some typos in source code
This commit is contained in:
Victor Vieux 2015-04-20 12:16:19 -07:00
parent 279ce86c40 413e93ed76
commit 2cb9b8e6fb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scheduler/filter/affinity_test.go
View File

@ -66,13 +66,13 @@ func TestAffinityFilter(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, result, nodes) assert.Equal(t, result, nodes)
// Set a constraint that cannot be fullfilled and expect an error back. // Set a constraint that cannot be fulfilled and expect an error back.
result, err = f.Filter(&dockerclient.ContainerConfig{ result, err = f.Filter(&dockerclient.ContainerConfig{
Env: []string{"affinity:container==does_not_exsits"}, Env: []string{"affinity:container==does_not_exsits"},
}, nodes) }, nodes)
assert.Error(t, err) assert.Error(t, err)
// Set a contraint that can only be filled by a single node. // Set a constraint that can only be filled by a single node.
result, err = f.Filter(&dockerclient.ContainerConfig{ result, err = f.Filter(&dockerclient.ContainerConfig{
Env: []string{"affinity:container==container-n0*"}, Env: []string{"affinity:container==container-n0*"},
}, nodes) }, nodes)
@ -80,7 +80,7 @@ func TestAffinityFilter(t *testing.T) {
assert.Len(t, result, 1) assert.Len(t, result, 1)
assert.Equal(t, result[0], nodes[0]) assert.Equal(t, result[0], nodes[0])
// This constraint can only be fullfilled by a subset of nodes. // This constraint can only be fulfilled by a subset of nodes.
result, err = f.Filter(&dockerclient.ContainerConfig{ result, err = f.Filter(&dockerclient.ContainerConfig{
Env: []string{"affinity:container==container-*"}, Env: []string{"affinity:container==container-*"},
}, nodes) }, nodes)

2
version/version.go
View File

@ -4,6 +4,6 @@ var (
// VERSION should be updated by hand at each release // VERSION should be updated by hand at each release
VERSION = "0.2.0" VERSION = "0.2.0"
// GITCOMMIT will be overritten automatically by the build system // GITCOMMIT will be overwritten automatically by the build system
GITCOMMIT = "HEAD" GITCOMMIT = "HEAD"
) )