Browse code

Merge pull request #18580 from tophj-ibm/fix-typo-blkio-invalid-device

Fix typo in named test and docs.

David Calavera authored on 2015/12/11 08:19:41
Showing 3 changed files
... ...
@@ -525,7 +525,7 @@ func (devices *DeviceSet) activateDeviceIfNeeded(info *devInfo, ignoreDeleted bo
525 525
 	// Make sure deferred removal on device is canceled, if one was
526 526
 	// scheduled.
527 527
 	if err := devices.cancelDeferredRemoval(info); err != nil {
528
-		return fmt.Errorf("Deivce Deferred Removal Cancellation Failed: %s", err)
528
+		return fmt.Errorf("Device Deferred Removal Cancellation Failed: %s", err)
529 529
 	}
530 530
 
531 531
 	if devinfo, _ := devicemapper.GetInfo(info.Name()); devinfo != nil && devinfo.Exists != 0 {
... ...
@@ -249,7 +249,7 @@ Json Parameters:
249 249
 -   **BlkioWeightDevice** - Block IO weight (relative device weight) in the form of:        `"BlkioWeightDevice": [{"Path": "device_path", "Weight": weight}]`
250 250
 -   **BlkioDeviceReadBps** - Limit read rate from a device in form of:	`"BlkioDeviceReadBps": [{"Path": "device_path", "Rate": rate}]`, for example:
251 251
 	`"BlkioDeviceReadBps": [{"Path": "/dev/sda", "Rate": "1024"}]"`
252
--   **BlkioDeviceWriteBps** - Limit write rate to a device in the form of:	`"BlkioDeviceWriteBps": [{"Path": "deivce_path", "Rate": rate}]`, for example:
252
+-   **BlkioDeviceWriteBps** - Limit write rate to a device in the form of:	`"BlkioDeviceWriteBps": [{"Path": "device_path", "Rate": rate}]`, for example:
253 253
 	`"BlkioDeviceWriteBps": [{"Path": "/dev/sda", "Rate": "1024"}]"`
254 254
 -   **MemorySwappiness** - Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.
255 255
 -   **OomKillDisable** - Boolean value, whether to disable OOM Killer for the container or not.
... ...
@@ -255,7 +255,7 @@ func (s *DockerSuite) TestRunWithBlkioInvalidWeightDevice(c *check.C) {
255 255
 	c.Assert(err, check.NotNil, check.Commentf(out))
256 256
 }
257 257
 
258
-func (s *DockerSuite) TestRunWithBlkioInvalidDeivceReadBps(c *check.C) {
258
+func (s *DockerSuite) TestRunWithBlkioInvalidDeviceReadBps(c *check.C) {
259 259
 	testRequires(c, blkioWeight)
260 260
 	out, _, err := dockerCmdWithError("run", "--device-read-bps", "/dev/sda:500", "busybox", "true")
261 261
 	c.Assert(err, check.NotNil, check.Commentf(out))