Index: head/cddl/contrib/opensolaris/cmd/zfs
===================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs	(revision 289689)
+++ head/cddl/contrib/opensolaris/cmd/zfs	(revision 289690)

Property changes on: head/cddl/contrib/opensolaris/cmd/zfs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/illumos/dist/cmd/zfs:r289689
Index: head/cddl/contrib/opensolaris
===================================================================
--- head/cddl/contrib/opensolaris	(revision 289689)
+++ head/cddl/contrib/opensolaris	(revision 289690)

Property changes on: head/cddl/contrib/opensolaris
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/illumos/dist:r289689