Skip to content

Commit d094a5c

Browse files
author
Mrunal Patel
authored
Merge pull request #749 from wking/array-of-x
*: Replace "array" type with "array of objects"
2 parents 99d224c + ff20749 commit d094a5c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

config-linux.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,14 +356,14 @@ The following parameters can be specified to setup the controller:
356356

357357
* **`blkioLeafWeight`** *(uint16, OPTIONAL)* - equivalents of `blkioWeight` for the purpose of deciding how much weight tasks in the given cgroup has while competing with the cgroup's child cgroups. The range is from 10 to 1000.
358358

359-
* **`blkioWeightDevice`** *(array, OPTIONAL)* - specifies the list of devices which will be bandwidth rate limited. The following parameters can be specified per-device:
359+
* **`blkioWeightDevice`** *(array of objects, OPTIONAL)* - specifies the list of devices which will be bandwidth rate limited. The following parameters can be specified per-device:
360360
* **`major, minor`** *(int64, REQUIRED)* - major, minor numbers for device. More info in `man mknod`.
361361
* **`weight`** *(uint16, OPTIONAL)* - bandwidth rate for the device, range is from 10 to 1000
362362
* **`leafWeight`** *(uint16, OPTIONAL)* - bandwidth rate for the device while competing with the cgroup's child cgroups, range is from 10 to 1000, CFQ scheduler only
363363

364364
You must specify at least one of `weight` or `leafWeight` in a given entry, and can specify both.
365365

366-
* **`blkioThrottleReadBpsDevice`**, **`blkioThrottleWriteBpsDevice`**, **`blkioThrottleReadIOPSDevice`**, **`blkioThrottleWriteIOPSDevice`** *(array, OPTIONAL)* - specify the list of devices which will be IO rate limited.
366+
* **`blkioThrottleReadBpsDevice`**, **`blkioThrottleWriteBpsDevice`**, **`blkioThrottleReadIOPSDevice`**, **`blkioThrottleWriteIOPSDevice`** *(array of objects, OPTIONAL)* - specify the list of devices which will be IO rate limited.
367367
The following parameters can be specified per-device:
368368
* **`major, minor`** *(int64, REQUIRED)* - major, minor numbers for device. More info in `man mknod`.
369369
* **`rate`** *(uint64, REQUIRED)* - IO rate limit for the device
@@ -436,7 +436,7 @@ The following parameters can be specified to setup the controller:
436436

437437
* **`classID`** *(uint32, OPTIONAL)* - is the network class identifier the cgroup's network packets will be tagged with
438438

439-
* **`priorities`** *(array, OPTIONAL)* - specifies a list of objects of the priorities assigned to traffic originating from processes in the group and egressing the system on various interfaces.
439+
* **`priorities`** *(array of objects, OPTIONAL)* - specifies a list of objects of the priorities assigned to traffic originating from processes in the group and egressing the system on various interfaces.
440440
The following parameters can be specified per-priority:
441441
* **`name`** *(string, REQUIRED)* - interface name
442442
* **`priority`** *(uint32, REQUIRED)* - priority applied to the interface

config.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ For example, if a configuration is compliant with version 1.1 of this specificat
4646

4747
## <a name="configMounts" />Mounts
4848

49-
**`mounts`** (array, OPTIONAL) specifies additional mounts beyond [`root`](#root).
49+
**`mounts`** (array of objects, OPTIONAL) specifies additional mounts beyond [`root`](#root).
5050
The runtime MUST mount entries in the listed order.
5151
For Linux, the parameters are as documented in [mount(2)][mount.2] system call man page.
5252
For Solaris, the mount entry corresponds to the 'fs' resource in the [zonecfg(1M)][zonecfg.1m] man page.
@@ -350,16 +350,16 @@ Implementations MUST error out when invalid values are encountered and MUST gene
350350
Hooks allow for the configuration of custom actions related to the [lifecycle](runtime.md#lifecycle) of the container.
351351

352352
* **`hooks`** (object, OPTIONAL) MAY contain any of the following properties:
353-
* **`prestart`** (array, OPTIONAL) is an array of [pre-start hooks](#prestart).
353+
* **`prestart`** (array of objects, OPTIONAL) is an array of [pre-start hooks](#prestart).
354354
Entries in the array contain the following properties:
355355
* **`path`** (string, REQUIRED) with similar semantics to [IEEE Std 1003.1-2001 `execv`'s *path*][ieee-1003.1-2001-xsh-exec].
356356
This specification extends the IEEE standard in that **`path`** MUST be absolute.
357357
* **`args`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2001 `execv`'s *argv*][ieee-1003.1-2001-xsh-exec].
358358
* **`env`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2001's `environ`][ieee-1003.1-2001-xbd-c8.1].
359359
* **`timeout`** (int, OPTIONAL) is the number of seconds before aborting the hook.
360-
* **`poststart`** (array, OPTIONAL) is an array of [post-start hooks](#poststart).
360+
* **`poststart`** (array of objects, OPTIONAL) is an array of [post-start hooks](#poststart).
361361
Entries in the array have the same schema as pre-start entries.
362-
* **`poststop`** (array, OPTIONAL) is an array of [post-stop hooks](#poststop).
362+
* **`poststop`** (array of objects, OPTIONAL) is an array of [post-stop hooks](#poststop).
363363
Entries in the array have the same schema as pre-start entries.
364364

365365
Hooks allow users to specify programs to run before or after various lifecycle events.

0 commit comments

Comments
 (0)