diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-24 14:07:14 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-24 14:07:14 +0000 |
| commit | 72313197becf405ef4e91a54aa4691e4a55868d1 (patch) | |
| tree | f268b3723d709ebdc46bf2136291cd04b27f7650 /manifest | |
| parent | 9812695da2de32f90ea47ba21e78e29437e4de8f (diff) | |
| parent | a2e92fdb91a6e5451ecb5488b74ee1e95a4bafd0 (diff) | |
| download | illumos-joyent-72313197becf405ef4e91a54aa4691e4a55868d1.tar.gz | |
[illumos-gate merge]
commit a2e92fdb91a6e5451ecb5488b74ee1e95a4bafd0
11691 ptree could show service FMRIs
commit 3ef756924267e272e432add760e4dc8597faef89
11849 listen of IPv6 address fails with EAFNOSUPPORT
commit 125965389c591835d37b560971900f263cc8f988
11844 add rdmsr utility
Conflicts:
usr/src/man/man1m/Makefile
usr/src/man/man1/ptree.1
usr/src/cmd/ptools/ptree/ptree.c
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -10888,6 +10888,7 @@ f usr/sbin/raidctl 0555 root bin f usr/sbin/ramdiskadm 0555 root bin f usr/sbin/rcapadm 0555 root bin f usr/sbin/rctladm 0555 root bin +f usr/sbin/rdmsr 0555 root bin h usr/sbin/reboot=usr/sbin/halt f usr/sbin/rem_drv 0555 root sys s usr/sbin/repquota=../lib/fs/ufs/repquota @@ -12536,6 +12537,7 @@ f usr/share/man/man1m/rcapadm.1m 0444 root bin f usr/share/man/man1m/rcapd.1m 0444 root bin f usr/share/man/man1m/rctladm.1m 0444 root bin f usr/share/man/man1m/rdate.1m 0444 root bin +f usr/share/man/man1m/rdmsr.1m 0444 root bin s usr/share/man/man1m/rdisc.1m=in.rdisc.1m f usr/share/man/man1m/reboot.1m 0444 root bin f usr/share/man/man1m/rem_drv.1m 0444 root bin |