]> CyberLeo.Net >> Repos - FreeBSD/stable/8.git/commit
MFC r230449:
authormm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sun, 29 Jan 2012 12:26:09 +0000 (12:26 +0000)
committermm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sun, 29 Jan 2012 12:26:09 +0000 (12:26 +0000)
commit3ae9231073f5334fa3d024b60c163717bb0fd711
treefe291a26de52bbb877fe137a651b5e8f356e96ec
parent55eee177bbf5b5cd95e908b07e5c7dcbef51afe1
MFC r230449:
Merge illumos revisions 13540, 13562:

illumos rev 13540 [1]:
Removal of pyzfs broke delegation for volumes

illumos rev 13562 [2]:
zfs allow arguments not parsed correctly after pyzfs removal

References:
https://www.illumos.org/issues/1726 [1]
https://www.illumos.org/issues/1977 [2]

Obtained from: illumos (issues #1726, #1977)

git-svn-id: svn://svn.freebsd.org/base/stable/8@230731 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
cddl/contrib/opensolaris/cmd/zfs/zfs_main.c