diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-04 12:57:43 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-04 12:57:43 +0000 |
| commit | c2613575ef96bded8fd59bfeb14e03208bcab7b9 (patch) | |
| tree | 0329d5ac287e5dcb35f78ac8f7870c50adc2f5fd /manifest | |
| parent | fcd0d2b370a514b41cab49a8c1a30e0a1789323e (diff) | |
| parent | 6357b94b54238e954e002562d0e89a2fefd982e1 (diff) | |
| download | illumos-joyent-c2613575ef96bded8fd59bfeb14e03208bcab7b9.tar.gz | |
[illumos-gate merge]
commit 6357b94b54238e954e002562d0e89a2fefd982e1
6415 sockets created via t_open/t_bind not shown by pfiles
6432 TLI sockets aren't detected correctly by pfiles in a NGZ
commit 260e9a87725c090ba5835b1f9f0b62fa2f96036f
6356 Update mdocml to 1.13.3
commit 1058dba45ec5d6876a5bbb0b9174347e13e5748d
6346 zfs(1M) has spurious comma
commit 3a005aada8ac0e291c13cbc488ba9ae1473f0a96
6377 Fix man page issues found by mandoc 1.13.3
commit fd76205d7372b305e64b7cfcd27939a39c743cb4
6397 libiscsit: several leaks due to left "errlist"
commit a9685eaab1313767d1d4dac672c3a468519aa899
6321 mountd: The IP to name translation is usually not needed in nfsauth_access()
Conflicts:
usr/src/cmd/ptools/pfiles/pfiles.c
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -9482,7 +9482,6 @@ f usr/lib/mail.local 0555 root bin f usr/lib/mailwrapper 0555 root bin f usr/lib/makekey 0555 root bin h usr/lib/makewhatis=usr/bin/man -f usr/lib/mandoc_preconv 0555 root bin d usr/lib/mdb 0755 root sys d usr/lib/mdb/kvm 0755 root sys d usr/lib/mdb/kvm/amd64 0755 root sys |