Browse code
Merge pull request #27947 from milindchawre/fix_27798
Fixes #27798 : Update help for --blkio-weight parameter
Vincent Demeester authored on 2016/11/09 23:35:38Showing 2 changed files
| ... | ... |
@@ -50,7 +50,7 @@ func NewUpdateCommand(dockerCli *command.DockerCli) *cobra.Command {
|
| 50 | 50 |
} |
| 51 | 51 |
|
| 52 | 52 |
flags := cmd.Flags() |
| 53 |
- flags.Uint16Var(&opts.blkioWeight, "blkio-weight", 0, "Block IO (relative weight), between 10 and 1000") |
|
| 53 |
+ flags.Uint16Var(&opts.blkioWeight, "blkio-weight", 0, "Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)") |
|
| 54 | 54 |
flags.Int64Var(&opts.cpuPeriod, "cpu-period", 0, "Limit CPU CFS (Completely Fair Scheduler) period") |
| 55 | 55 |
flags.Int64Var(&opts.cpuQuota, "cpu-quota", 0, "Limit CPU CFS (Completely Fair Scheduler) quota") |
| 56 | 56 |
flags.Int64Var(&opts.cpuRealtimePeriod, "cpu-rt-period", 0, "Limit the CPU real-time period in microseconds") |
| ... | ... |
@@ -224,7 +224,7 @@ func AddFlags(flags *pflag.FlagSet) *ContainerOptions {
|
| 224 | 224 |
flags.BoolVar(&copts.noHealthcheck, "no-healthcheck", false, "Disable any container-specified HEALTHCHECK") |
| 225 | 225 |
|
| 226 | 226 |
// Resource management |
| 227 |
- flags.Uint16Var(&copts.blkioWeight, "blkio-weight", 0, "Block IO (relative weight), between 10 and 1000") |
|
| 227 |
+ flags.Uint16Var(&copts.blkioWeight, "blkio-weight", 0, "Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)") |
|
| 228 | 228 |
flags.Var(&copts.blkioWeightDevice, "blkio-weight-device", "Block IO weight (relative device weight)") |
| 229 | 229 |
flags.StringVar(&copts.containerIDFile, "cidfile", "", "Write the container ID to the file") |
| 230 | 230 |
flags.StringVar(&copts.cpusetCpus, "cpuset-cpus", "", "CPUs in which to allow execution (0-3, 0,1)") |