]> CyberLeo.Net >> Repos - FreeBSD/stable/9.git/commit
MFC r230449:
authormm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sun, 29 Jan 2012 12:25:21 +0000 (12:25 +0000)
committermm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sun, 29 Jan 2012 12:25:21 +0000 (12:25 +0000)
commita48411f7da016072ef9400289b27f85ab6ddbbca
tree8f0b0b143376ad6ebbfe020f289827b4347cfe3a
parent31cd67d0d55d6ed3fe8d4b74a5d64fcd9d8ac0ef
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/9@230730 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
cddl/contrib/opensolaris/cmd/zfs/zfs_main.c