Browse code

Merge pull request #15482 from hqhq/hq_fix_run_doc

Add format description in run doc

Sebastiaan van Stijn authored on 2015/08/20 00:13:00
Showing 1 changed files
... ...
@@ -505,18 +505,18 @@ parent group.
505 505
 The operator can also adjust the performance parameters of the
506 506
 container:
507 507
 
508
-| Option                               |  Description                                                                                      |
509
-|--------------------------------------|---------------------------------------------------------------------------------------------|
510
-| `-m`, `--memory="" `                 | Memory limit (format: , where unit = b, k, m or g)                                          |
511
-| `--memory-swap=""`                   | Total memory limit (memory + swap, format: , where unit = b, k, m or g)                     |
512
-| `-c`, `--cpu-shares=0`               | CPU shares (relative weight)                                                                |
513
-| `--cpu-period=0`                     | Limit the CPU CFS (Completely Fair Scheduler) period                                        |
514
-| `--cpuset-cpus="" `                  | CPUs in which to allow execution (0-3, 0,1)                                                 |
515
-| `--cpuset-mems=""`                   | Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems. |
516
-| `--cpu-quota=0`                      | Limit the CPU CFS (Completely Fair Scheduler) quota                                         |
517
-| `--blkio-weight=0`                   | Block IO weight (relative weight) accepts a weight value between 10 and 1000.               |
518
-| `--oom-kill-disable=true` or `false` | Whether to disable OOM Killer for the container or not.                                     |
519
-| `--memory-swappiness=""  `           | Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.        |
508
+| Option                     |  Description                                                                                |
509
+|----------------------------|---------------------------------------------------------------------------------------------|
510
+| `-m`, `--memory="" `       | Memory limit (format: `<number>[<unit>]`, where unit = b, k, m or g)                        |
511
+| `--memory-swap=""`         | Total memory limit (memory + swap, format: `<number>[<unit>]`, where unit = b, k, m or g)   |
512
+| `-c`, `--cpu-shares=0`     | CPU shares (relative weight)                                                                |
513
+| `--cpu-period=0`           | Limit the CPU CFS (Completely Fair Scheduler) period                                        |
514
+| `--cpuset-cpus="" `        | CPUs in which to allow execution (0-3, 0,1)                                                 |
515
+| `--cpuset-mems=""`         | Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems. |
516
+| `--cpu-quota=0`            | Limit the CPU CFS (Completely Fair Scheduler) quota                                         |
517
+| `--blkio-weight=0`         | Block IO weight (relative weight) accepts a weight value between 10 and 1000.               |
518
+| `--oom-kill-disable=false` | Whether to disable OOM Killer for the container or not.                                     |
519
+| `--memory-swappiness=""  ` | Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.        |
520 520
 
521 521
 ### Memory constraints
522 522