summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-07-23 12:39:31 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-07-23 12:39:31 +0000
commitc69b5d8dd030b09837cba039acde55abedd6f408 (patch)
tree14a52c73181138842cb92cd9dc6e751a295be188 /manifest
parentc697085b76d32ea7025959f61179747ba7a9f921 (diff)
parentac4f20c056d4e5beb8b62e2c843802e3298be389 (diff)
downloadillumos-joyent-c69b5d8dd030b09837cba039acde55abedd6f408.tar.gz
[illumos-gate merge]
commit ac4f20c056d4e5beb8b62e2c843802e3298be389 11484 usr/src/cmd/ypcmd/ypupdated.c is unused commit 275a2dc2ef933b7b810b98855f8ee3fa0e662007 11483 usr/src/cmd/spell/malloc.c is unused commit a25df66779f8c4c58005d492d3ceac6312116360 11364 Want system event for datalink state changes 11365 Want ability to toggle etherstub link state commit 78d23b23ae6c0e2213934bf6698f8447eee94b2e 11396 ndmpd: NULL pointer errors commit c77bf7778622780cbb6cd7b4e39f428948e33280 11391 keyserv: NULL pointer errors commit b89e8170ec8d28d026b67ad7ce606c02a83398dc 11390 krb5: NULL pointer errors Conflicts: usr/src/uts/common/sys/sysevent/datalink.h usr/src/uts/common/sys/sysevent.h usr/src/uts/common/io/dls/dls_mgmt.c usr/src/uts/common/io/dls/dls_link.c
Diffstat (limited to 'manifest')
-rw-r--r--manifest1
1 files changed, 1 insertions, 0 deletions
diff --git a/manifest b/manifest
index cf5ce66068..bf032129e7 100644
--- a/manifest
+++ b/manifest
@@ -18095,6 +18095,7 @@ f usr/share/man/man3sysevent/sysevent_post_event.3sysevent 0444 root bin
f usr/share/man/man3sysevent/sysevent_subscribe_event.3sysevent 0444 root bin
s usr/share/man/man3sysevent/sysevent_unbind_handle.3sysevent=sysevent_bind_handle.3sysevent
s usr/share/man/man3sysevent/sysevent_unsubscribe_event.3sysevent=sysevent_subscribe_event.3sysevent
+f usr/share/man/man3sysevent/sysevents.3sysevent 0444 root bin
d usr/share/man/man3tecla 0755 root bin
s usr/share/man/man3tecla/cfc_file_start.3tecla=cpl_complete_word.3tecla
s usr/share/man/man3tecla/cfc_literal_escapes.3tecla=cpl_complete_word.3tecla