From d31afa6053f2c9cb6600ae31aeb7b5f8ae663160 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Tue, 12 Apr 2016 16:45:05 +0200 Subject: [PATCH] Fix a typo in hostConfig.ShmSize validation Other places referring to the same configuration, including docs, have the correct spelling. Signed-off-by: Rodolfo Carvalho Upstream-commit: fee7e7c7a31023be9f0c26608e6cbd4e8a97d25b Component: engine --- components/engine/daemon/daemon_unix.go | 2 +- components/engine/integration-cli/docker_api_containers_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/daemon/daemon_unix.go b/components/engine/daemon/daemon_unix.go index 9e231c5158..86eb5ad5ce 100644 --- a/components/engine/daemon/daemon_unix.go +++ b/components/engine/daemon/daemon_unix.go @@ -525,7 +525,7 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes. warnings = append(warnings, w...) if hostConfig.ShmSize < 0 { - return warnings, fmt.Errorf("SHM size must be greater then 0") + return warnings, fmt.Errorf("SHM size must be greater than 0") } if hostConfig.OomScoreAdj < -1000 || hostConfig.OomScoreAdj > 1000 { diff --git a/components/engine/integration-cli/docker_api_containers_test.go b/components/engine/integration-cli/docker_api_containers_test.go index 3368af345b..57a35ba85f 100644 --- a/components/engine/integration-cli/docker_api_containers_test.go +++ b/components/engine/integration-cli/docker_api_containers_test.go @@ -1462,7 +1462,7 @@ func (s *DockerSuite) TestPostContainersCreateShmSizeNegative(c *check.C) { status, body, err := sockRequest("POST", "/containers/create", config) c.Assert(err, check.IsNil) c.Assert(status, check.Equals, http.StatusInternalServerError) - c.Assert(string(body), checker.Contains, "SHM size must be greater then 0") + c.Assert(string(body), checker.Contains, "SHM size must be greater than 0") } func (s *DockerSuite) TestPostContainersCreateShmSizeHostConfigOmitted(c *check.C) {