diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-17 12:00:11 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-17 12:00:11 +0000 |
| commit | 275d73b3f371fe2c5b2e67a1c86ef4b5781ac33c (patch) | |
| tree | 9d7d1d59320de0686fa2fbf770be55d114ee628d /usr/src/pkg/manifests/system-test-zfstest.mf | |
| parent | d3ca33877d23e01eff12715a6c2466f5340f622d (diff) | |
| parent | 68ecb2ec930c4b0f00acaf8e0abb2b19c4b8b76f (diff) | |
| download | illumos-joyent-275d73b3f371fe2c5b2e67a1c86ef4b5781ac33c.tar.gz | |
[illumos-gate merge]
commit 68ecb2ec930c4b0f00acaf8e0abb2b19c4b8b76f
6393 zfs receive a full send as a clone
commit 3d729aecc03ea6ebb9bd5d56b8dccd24f57daa41
6342 want signalfd support
commit f9eb9fdf196b6ed476e4ffc69cecd8b0da3cb7e7
6451 ztest fails due to checksum errors
Conflicts:
usr/src/uts/sparc/Makefile.sparc
usr/src/uts/common/os/sig.c
usr/src/uts/common/io/signalfd.c
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 ffea12e25b..70e5ff602e 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -10,7 +10,7 @@ # # -# Copyright (c) 2012, 2014 by Delphix. All rights reserved. +# Copyright (c) 2012, 2015 by Delphix. All rights reserved. # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2015, Nexenta Systems Inc. All rights reserved. # @@ -662,6 +662,9 @@ file \ file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_009_neg \ mode=0555 +file \ + path=opt/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_010_pos \ + mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_rename/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_rename/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename.cfg \ |