diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-06 11:14:47 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-06 11:14:47 +0000 |
| commit | 17cfdc699172b87333adc4e6221fb6c158a79376 (patch) | |
| tree | f09335d90292625e9519c8fd601cee91305dfc6c /manifest | |
| parent | 30b14a2f2fbb80be9bbb7fbb29620fcc1b922e80 (diff) | |
| parent | 00fc50d191cf90458c41a077d59fe2f81223f00a (diff) | |
| download | illumos-joyent-17cfdc699172b87333adc4e6221fb6c158a79376.tar.gz | |
[illumos-gate merge]
commit 00fc50d191cf90458c41a077d59fe2f81223f00a
11200 cpcgen needs smatch fixes again
commit 726d8a6eb1683fac6b175317648eb4f4c36cb5a9
11085 loader: block all output via tem while tem is reconfigured
commit 6c97119c7cb695abdfe81ac4b666f5c67eb77ed7
11201 zfs test zpool_create_020_pos leaves a directory behind
commit 262d6380c033d57f7438d7ef213bfe967788a59c
1841 SMB dtrace provider is incomplete (fix dtrace breakage)
commit 0e35cc03de180a2fdef6c639e43b43824f85c65b
10939 libdiskstatus trusts disk mode sense data to its death
Conflicts:
usr/src/lib/fm/libdiskstatus/common/ds_scsi_uscsi.c
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -5494,6 +5494,7 @@ f usr/lib/dtrace/regs.d 0644 root bin f usr/lib/dtrace/sched.d 0644 root bin f usr/lib/dtrace/scsi.d 0644 root bin f usr/lib/dtrace/signal.d 0644 root bin +f usr/lib/dtrace/smb.d 0644 root bin f usr/lib/dtrace/srp.d 0644 root bin f usr/lib/dtrace/sysevent.d 0644 root bin f usr/lib/dtrace/tcp.d 0644 root bin @@ -10239,6 +10240,8 @@ f usr/lib/smbfs/smbiod 0555 root bin f usr/lib/smbfs/smbiod-svc 0555 root bin d usr/lib/smbsrv 0755 root bin d usr/lib/smbsrv/dtrace 0755 root bin +f usr/lib/smbsrv/dtrace/smb-trace.d 0555 root bin +f usr/lib/smbsrv/dtrace/smb2-trace.d 0555 root bin f usr/lib/smbsrv/dtrace/smbd-all.d 0555 root bin f usr/lib/smbsrv/dtrace/smbd-authsvc.d 0555 root bin f usr/lib/smbsrv/dtrace/smbd-doorsvc.d 0555 root bin |