diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-11-27 12:40:58 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-11-27 12:40:58 +0000 |
| commit | 0b9ea52a4deeddf07798ece50f1c75d7de101baa (patch) | |
| tree | 23e4dc323ed06dbd274c969bdd51e371fad0dd9f /usr/src/pkg | |
| parent | a0fae2e039f343951fa97d02c576ee3d45c877d1 (diff) | |
| parent | c5832a5333c189dfa346a3c1edac9fa39e1de4cb (diff) | |
| download | illumos-joyent-0b9ea52a4deeddf07798ece50f1c75d7de101baa.tar.gz | |
[illumos-gate merge]
commit c5832a5333c189dfa346a3c1edac9fa39e1de4cb
12002 async unlinked drain
commit e2336878c3b2087bcf5c52436847f37afaec8666
11960 Add topo module and hdl api for freeing string array
commit bb51a979b2badfaa6cf79bcb781b23aa6c1502f2
12021 zfs_diff tests missing Makefile deps
commit 05c00ec58206e104da9853d2117cf39602f4d5ee
12010 extra whitespace in mmap(2)
commit f52943a93040563107b95bccb9db87d9971ef47d
12016 Use of GNU ld should explicitly specify the required output format
commit a64e1e23aa6dde2e865402bb20dde999f835fdc5
11996 format: modify should not ask for GPT partition 7
commit d30992fa3989ef47543839be59b8c86165285ec4
11995 format: efi usable size is missing 1 sector
Conflicts:
usr/src/lib/fm/topo/libtopo/common/topo_string.c
usr/src/lib/fm/topo/libtopo/common/topo_mod.h
usr/src/lib/fm/topo/libtopo/common/mapfile-vers
Diffstat (limited to 'usr/src/pkg')
| -rw-r--r-- | usr/src/pkg/manifests/system-test-zfstest.mf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf index f5d7d5d07d..c3d98e063a 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -2619,6 +2619,8 @@ file path=opt/zfs-tests/tests/functional/mmp/setup mode=0555 file path=opt/zfs-tests/tests/functional/mount/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/mount/setup mode=0555 file path=opt/zfs-tests/tests/functional/mount/umount_001 mode=0555 +file path=opt/zfs-tests/tests/functional/mount/umount_002 mode=0555 +file path=opt/zfs-tests/tests/functional/mount/umount_unlinked_drain mode=0555 file path=opt/zfs-tests/tests/functional/mount/umountall_001 mode=0555 file path=opt/zfs-tests/tests/functional/mv_files/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/mv_files/mv_files.cfg mode=0444 |