From owner-svn-src-all@FreeBSD.ORG  Tue Jul  1 21:57:16 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 499C954B;
 Tue,  1 Jul 2014 21:57:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1CA9B2346;
 Tue,  1 Jul 2014 21:57:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61LvF7x024380;
 Tue, 1 Jul 2014 21:57:15 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61LvF7t024379;
 Tue, 1 Jul 2014 21:57:15 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201407012157.s61LvF7t024379@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 1 Jul 2014 21:57:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268124 - head/sys/cddl/contrib/opensolaris
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jul 2014 21:57:16 -0000

Author: delphij
Date: Tue Jul  1 21:57:15 2014
New Revision: 268124
URL: http://svnweb.freebsd.org/changeset/base/268124

Log:
  Mark r268120 as merged.  We believe that the LZ4 usage in ZFS is not
  affected and plans to sync with upstream LZ4 in the near future.

Modified:
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)