diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-09-20 11:59:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-09-20 11:59:56 +0000 |
| commit | a49e2686fd3e0bb76394296d7b3e5f9fea367525 (patch) | |
| tree | 2d52035b8f9e6cb0476ddb79034e4629f65f7176 /manifest | |
| parent | c9bb6e653d30a4879db3875d871d38cf65f9f3a5 (diff) | |
| parent | 067a68e3f9f9695a8a52350c0179d29947040ff8 (diff) | |
| download | illumos-joyent-a49e2686fd3e0bb76394296d7b3e5f9fea367525.tar.gz | |
[illumos-gate merge]
commit 067a68e3f9f9695a8a52350c0179d29947040ff8
11592 sdp: cast between incompatible function types
commit b79609a5823c681de453be676098d9635305e6a7
11591 usbser: cast between incompatible function types
commit d1704f8ef75a0e4e2dff36192648884817b6f076
11687 isaexec() leaks memory if realloc fails
commit 2b77347cd95dc12475fe2af8a715097166d0523a
11683 Automatically maintain whatis database
commit f5700834e5d27ffa87ba2d9ec0fe5b4e38f5bb1c
11702 loader: zalloc cstyle cleanup
commit 13027a8e96cb0ef5c5e3dbe2594f7a17b73a95b5
11615 should handle locale charmap aliases
commit e75b2cb046700ccab0100afdcd81f2b860fcca87
11706 crypto tests need to run 32-bit and 64-bit
Conflicts:
usr/src/test/crypto-tests/tests/modes/aes/gcm/Makefile
usr/src/test/crypto-tests/tests/modes/aes/ecb/Makefile
usr/src/test/crypto-tests/tests/modes/aes/ctr/Makefile
usr/src/test/crypto-tests/tests/modes/aes/cmac/Makefile
usr/src/test/crypto-tests/tests/modes/aes/ccm/Makefile
usr/src/test/crypto-tests/tests/modes/aes/cbc/Makefile
usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs
usr/src/test/crypto-tests/tests/digest/Makefile
usr/src/test/crypto-tests/tests/common/Makefile
usr/src/test/crypto-tests/runfiles/default.run
usr/src/cmd/man/Makefile
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1758,6 +1758,7 @@ f lib/svc/manifest/system/svc/global.xml 0444 root sys f lib/svc/manifest/system/svc/restarter.xml 0444 root sys f lib/svc/manifest/system/sysevent.xml 0444 root sys f lib/svc/manifest/system/system-log.xml 0444 root sys +f lib/svc/manifest/system/update-man-index.xml 0444 root sys f lib/svc/manifest/system/utmp.xml 0444 root sys f lib/svc/manifest/system/vtdaemon.xml 0444 root sys f lib/svc/manifest/system/zones.xml 0444 root sys @@ -1854,6 +1855,7 @@ f lib/svc/method/svc-zones 0555 root sys f lib/svc/method/sysidtool-net 0555 root bin f lib/svc/method/sysidtool-system 0555 root bin f lib/svc/method/system-log 0555 root bin +f lib/svc/method/update-man-index 0555 root bin f lib/svc/method/vtdaemon 0555 root bin f lib/svc/method/yp 0555 root bin d lib/svc/monitor 0755 root bin |