summaryrefslogtreecommitdiff
path: root/usr/src/pkg/manifests
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2020-05-01 11:36:33 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2020-05-01 11:36:33 +0000
commit363d63cac68cdd10faf2dc4f7b4685713a4706af (patch)
tree2623fbf36694640e6015b4570f47f217b4df8ccd /usr/src/pkg/manifests
parent54a7e5761a35624975c2f384a98b3235bf625094 (diff)
parentef9416a894c90df5d46b888dbe2908c7f00fd409 (diff)
downloadillumos-joyent-363d63cac68cdd10faf2dc4f7b4685713a4706af.tar.gz
[illumos-gate merge]
commit ef9416a894c90df5d46b888dbe2908c7f00fd409 12296 unix: access_mask_check() warn: bitwise AND condition is false here commit 9f9cceb6f1158940244c35cecdbc93f9a386a4b8 12662 smbios(1M) interprets jedec IDs incorrectly 12664 fix smbios memory technology operating mode capabilities commit f343451914d0efaf2d6fc84d8818a16246b223dc 12635 Allow for '-o feature@<feature>=disabled' on the command line
Diffstat (limited to 'usr/src/pkg/manifests')
-rw-r--r--usr/src/pkg/manifests/system-test-zfstest.mf3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf
index fd373bc8ca..5cd3c7b5e8 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.mf
+++ b/usr/src/pkg/manifests/system-test-zfstest.mf
@@ -1633,6 +1633,9 @@ file \
path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_004_neg \
mode=0555
file \
+ path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_005_pos \
+ mode=0555
+file \
path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_tempname \
mode=0555
file \