]> CyberLeo.Net >> Repos - FreeBSD/stable/8.git/commit
MFC r205200 + r206199
authordelphij <delphij@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 15 Apr 2010 01:25:17 +0000 (01:25 +0000)
committerdelphij <delphij@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 15 Apr 2010 01:25:17 +0000 (01:25 +0000)
commita52d5e9ddab5ca534a1e0026d0b996b22144b623
tree309c3d383ee156d42ff45f062dee470c926f6e51
parenta478a88dfe10abbf95ce25913c10ab555d1ffb1c
MFC r205200 + r206199

Merge OpenSolaris revision 9396:f41cf682d0d3:

6830813 zfs list -t all fails assertion

*Note that this is only a partial merge of this revision addressing only
this one issue.*

PR: bin/144720
Submitted by: mm

git-svn-id: svn://svn.freebsd.org/base/stable/8@206642 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c