]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit - contrib/pf/pfctl/pfctl.8
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d30b88a 1aa03d3)
Merge illumos commit 13749:df4cd82e2b60
authorMartin Matuska <mm@FreeBSD.org>
Fri, 13 Jul 2012 12:37:34 +0000 (12:37 +0000)
committerMartin Matuska <mm@FreeBSD.org>
Fri, 13 Jul 2012 12:37:34 +0000 (12:37 +0000)
commitbc06fa92817ffcdc98319363284cbfd1941fc435
tree0b26862b3421ec92b92c483a3af03f3ae2c00c67tree | snapshot
parentd30b88af05f4abb65decde42e9b0d5e4498621c4commit | diff
parent1aa03d3a8432d812a4400b9b99cf10959bc5c43ccommit | diff
Merge illumos commit 13749:df4cd82e2b60

1796 "ZFS HOLD" should not be used when doing "ZFS SEND" froma read-only pool
2871 support for __ZFS_POOL_RESTRICT used by ZFS test suite
2903 zfs destroy -d does not work
2957 zfs destroy -R/r sometimes fails when removing defer-destroyed snapshot

References:
https://www.illumos.org/issues/1796
https://www.illumos.org/issues/2871
https://www.illumos.org/issues/2903
https://www.illumos.org/issues/2957

MFC after: 1 week
cddl/contrib/opensolaris/cmd/zfs/zfs_main.c diff1 | diff2 | blob | history
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c diff1 | diff2 | blob | history
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c diff1 | diff2 | blob | history
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.