freebsd-dev/cddl
Martin Matuska 3742a70580 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)
MFC after:	1 week
2012-01-22 08:06:36 +00:00
..
compat/opensolaris Remove C constructs that are incompatible with C++ from various 2011-06-10 20:10:30 +00:00
contrib Merge illumos revisions 13540, 13562: 2012-01-22 08:06:36 +00:00
lib Merge new ZFS features from illumos: 2011-11-28 21:40:00 +00:00
sbin For now, remove MANFILTER from ZFS manpages (bad effect on html output). 2011-11-21 14:50:17 +00:00
usr.bin For now, remove MANFILTER from ZFS manpages (bad effect on html output). 2011-11-21 14:50:17 +00:00
usr.sbin For now, remove MANFILTER from ZFS manpages (bad effect on html output). 2011-11-21 14:50:17 +00:00
Makefile
Makefile.inc Do not lint code beyond necessity (with apologies to Wiliam of Ockham). 2010-11-18 16:32:52 +00:00