diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-06-29 12:41:18 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-06-29 12:41:18 +0000 |
| commit | 17296045b06634567568b1654a46c22c764d76e9 (patch) | |
| tree | a2454d2c17bc51a6a23f427d741d184ef332516a /usr/src/lib | |
| parent | 0e23d370e331acbebe8ad55ddb59eb475b05405a (diff) | |
| parent | 229852ddf2d8636b0c8a6628c3e97fef2aadbcfd (diff) | |
| download | illumos-joyent-release-20180705.tar.gz | |
[illumos-gate merge]release-20180705
commit 229852ddf2d8636b0c8a6628c3e97fef2aadbcfd
9629 ksh93(1): Missing zero in z4cx
commit ea30102ce458697473b0435bcdc7647dce2551f4
9586 need to handle SP's that present multiple sensors with the same entity name
9587 Add test mechanism to sensor-transport module for spoofing sensor states
Conflicts:
usr/src/lib/fm/topo/libtopo/common/topo_method.c
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/fm/topo/libtopo/common/topo_method.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/lib/fm/topo/libtopo/common/topo_method.c b/usr/src/lib/fm/topo/libtopo/common/topo_method.c index 728d76ad82..79e10302af 100644 --- a/usr/src/lib/fm/topo/libtopo/common/topo_method.c +++ b/usr/src/lib/fm/topo/libtopo/common/topo_method.c @@ -407,16 +407,16 @@ topo_spoof_apply(topo_hdl_t *thp, tnode_t *node, tnode_t *facnode, * which sensors indicated failure. The return value is an nvlist of nvlists * indexed by sensor name, each entry with the following contents: * - * type, state, units, reading + * type, state, units, reading * - * Identical to sensor node. + * Identical to sensor node. * - * nonrecov + * nonrecov * - * Boolean value that is set to indicate that the error is - * non-recoverable (the unit is out of service). The default is - * critical failure, which indicates a fault but the unit is still - * operating. + * Boolean value that is set to indicate that the error is + * non-recoverable (the unit is out of service). The default is + * critical failure, which indicates a fault but the unit is still + * operating. * * injected * |