From 7c077c2c3443fdb9b13b7790bc96cdaa287cf381 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Thu, 10 Dec 2015 14:40:32 -0600 Subject: [PATCH] Fixed typo change deivce to device. This changes deivce to device in daemon, test and docs. Signed-off-by: Christopher Jones --- daemon/graphdriver/devmapper/deviceset.go | 2 +- docs/reference/api/docker_remote_api_v1.22.md | 2 +- integration-cli/docker_cli_run_unix_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index b7eb3206e0..46a0bcb9aa 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -525,7 +525,7 @@ func (devices *DeviceSet) activateDeviceIfNeeded(info *devInfo, ignoreDeleted bo // Make sure deferred removal on device is canceled, if one was // scheduled. if err := devices.cancelDeferredRemoval(info); err != nil { - return fmt.Errorf("Deivce Deferred Removal Cancellation Failed: %s", err) + return fmt.Errorf("Device Deferred Removal Cancellation Failed: %s", err) } if devinfo, _ := devicemapper.GetInfo(info.Name()); devinfo != nil && devinfo.Exists != 0 { diff --git a/docs/reference/api/docker_remote_api_v1.22.md b/docs/reference/api/docker_remote_api_v1.22.md index cf6c2f3c0c..d1860ebc9d 100644 --- a/docs/reference/api/docker_remote_api_v1.22.md +++ b/docs/reference/api/docker_remote_api_v1.22.md @@ -249,7 +249,7 @@ Json Parameters: - **BlkioWeightDevice** - Block IO weight (relative device weight) in the form of: `"BlkioWeightDevice": [{"Path": "device_path", "Weight": weight}]` - **BlkioDeviceReadBps** - Limit read rate from a device in form of: `"BlkioDeviceReadBps": [{"Path": "device_path", "Rate": rate}]`, for example: `"BlkioDeviceReadBps": [{"Path": "/dev/sda", "Rate": "1024"}]"` -- **BlkioDeviceWriteBps** - Limit write rate to a device in the form of: `"BlkioDeviceWriteBps": [{"Path": "deivce_path", "Rate": rate}]`, for example: +- **BlkioDeviceWriteBps** - Limit write rate to a device in the form of: `"BlkioDeviceWriteBps": [{"Path": "device_path", "Rate": rate}]`, for example: `"BlkioDeviceWriteBps": [{"Path": "/dev/sda", "Rate": "1024"}]"` - **MemorySwappiness** - Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100. - **OomKillDisable** - Boolean value, whether to disable OOM Killer for the container or not. diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index 453cc2dba3..a411d2e7af 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -255,7 +255,7 @@ func (s *DockerSuite) TestRunWithBlkioInvalidWeightDevice(c *check.C) { c.Assert(err, check.NotNil, check.Commentf(out)) } -func (s *DockerSuite) TestRunWithBlkioInvalidDeivceReadBps(c *check.C) { +func (s *DockerSuite) TestRunWithBlkioInvalidDeviceReadBps(c *check.C) { testRequires(c, blkioWeight) out, _, err := dockerCmdWithError("run", "--device-read-bps", "/dev/sda:500", "busybox", "true") c.Assert(err, check.NotNil, check.Commentf(out))