Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print	(revision 286678)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print	(revision 286679)

Property changes on: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/illumos/dist/cmd/dtrace/test/tst/common/print:r277425-277428,277430,286538,286540,286542,286544,286546,286548,286550,286553,286555,286586,286588,286597,286599,286602,286604
Index: head/cddl/contrib/opensolaris/cmd/zfs
===================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs	(revision 286678)
+++ head/cddl/contrib/opensolaris/cmd/zfs	(revision 286679)

Property changes on: head/cddl/contrib/opensolaris/cmd/zfs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/illumos/dist/cmd/zfs:r277425-277428,277430,286538,286540,286542,286544,286546,286548,286550,286553,286555,286586,286588,286597,286599,286602,286604
Index: head/cddl/contrib/opensolaris/lib/libzfs
===================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs	(revision 286678)
+++ head/cddl/contrib/opensolaris/lib/libzfs	(revision 286679)

Property changes on: head/cddl/contrib/opensolaris/lib/libzfs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/illumos/dist/lib/libzfs:r277425-277428,277430,286538,286540,286542,286544,286546,286548,286550,286553,286555,286586,286588,286597,286599,286602,286604
Index: head/cddl/contrib/opensolaris
===================================================================
--- head/cddl/contrib/opensolaris	(revision 286678)
+++ head/cddl/contrib/opensolaris	(revision 286679)

Property changes on: head/cddl/contrib/opensolaris
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/illumos/dist:r277425-277428,277430,286538,286540,286542,286544,286546,286548,286550,286553,286555,286586,286588,286597,286599,286602,286604
Index: head/sys/cddl/contrib/opensolaris
===================================================================
--- head/sys/cddl/contrib/opensolaris	(revision 286678)
+++ head/sys/cddl/contrib/opensolaris	(revision 286679)

Property changes on: head/sys/cddl/contrib/opensolaris
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor-sys/illumos/dist:r277425-277428,277430,286538,286540,286542,286544,286546,286548,286550,286553,286555,286586,286588,286597,286599,286602,286604