diff options
author | Jason King <jason.king@joyent.com> | 2020-01-23 17:12:56 -0600 |
---|---|---|
committer | Jason King <jason.king@joyent.com> | 2020-02-03 08:45:58 -0600 |
commit | 2d85dedb8eaa3ba69c85560030efe4cbc815efb8 (patch) | |
tree | 7ea2580f9aa43be69e419479fe3e1a48b736f638 /usr/src/pkg/manifests/system-test-zfstest.mf | |
parent | 442c994cdeb1e51c84e6d7ba987af00893aa84c4 (diff) | |
download | illumos-joyent-2d85dedb8eaa3ba69c85560030efe4cbc815efb8.tar.gz |
12245 Support inheriting properties in zfs channel programs
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/pkg/manifests/system-test-zfstest.mf')
-rw-r--r-- | usr/src/pkg/manifests/system-test-zfstest.mf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf index 0a95e4d759..d4432b45a1 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -13,7 +13,7 @@ # Copyright (c) 2012, 2017 by Delphix. All rights reserved. # Copyright 2015, 2016 Nexenta Systems, Inc. All rights reserved. # Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2019 Joyent, Inc. +# Copyright 2020 Joyent, Inc. # Copyright (c) 2018 Datto Inc. # @@ -600,6 +600,9 @@ file \ path=opt/zfs-tests/tests/functional/channel_program/synctask_core/tst.get_written \ mode=0555 file \ + path=opt/zfs-tests/tests/functional/channel_program/synctask_core/tst.inherit \ + mode=0555 +file \ path=opt/zfs-tests/tests/functional/channel_program/synctask_core/tst.list_children \ mode=0555 file \ |