diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-13 12:49:53 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-13 12:49:53 +0000 |
| commit | 7bdc9fd5709f34b213a7ea295bff1bcc02bcf20c (patch) | |
| tree | c63cfcaf3d4017b5e1c96862038fb2e2c0cfdd93 /manifest | |
| parent | b44b91e41531b86f9807aecf62d96cad6f2f06cd (diff) | |
| parent | ce41cfb3d0fca3db767eb99d2edb4f5211465a99 (diff) | |
| download | illumos-joyent-7bdc9fd5709f34b213a7ea295bff1bcc02bcf20c.tar.gz | |
[illumos-gate merge]
commit ce41cfb3d0fca3db767eb99d2edb4f5211465a99
12161 picl: argument to 'alloca' may be too large
commit b871f899336f28769ec7f17673f792691454e6a3
11876 Want a native sleep
commit e10a3c4b7b33ed6ba9818feb9ea6ae25501e4c0a
12177 loader: bioscd probe can get sector size 0
commit ac04831df9010f533275633d3bb9829b86c171d3
12085 zvol_dumpio would be cleaner with vdev_op_dumpio
commit 317c37f36c90aaecad34bee96f73586514294a7f
12068 Fix ambiguous bay/disk labels on Joyent-S10G5
commit 5a0e240f87295cfc13c53236f30ccace0d5412c7
12166 resync smatch to 0.6.1-rc1-il-3
Conflicts:
usr/src/uts/common/fs/zfs/vdev_disk.c
usr/src/test/util-tests/tests/Makefile
usr/src/pkg/manifests/system-test-utiltest.mf
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2802,7 +2802,7 @@ h usr/bin/setuname=usr/lib/isaexec s usr/bin/sh=ksh93 f usr/bin/shcomp 0555 root bin f usr/bin/size 0555 root bin -h usr/bin/sleep=usr/bin/alias +f usr/bin/sleep 0555 root bin f usr/bin/smbutil 0555 root bin f usr/bin/soelim 0555 root bin h usr/bin/sort=usr/lib/isaexec |