From owner-svn-src-stable@FreeBSD.ORG  Fri Jul  5 04:16:03 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BE110A2D;
 Fri,  5 Jul 2013 04:16:03 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AEE551F67;
 Fri,  5 Jul 2013 04:16:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r654G3iR077321;
 Fri, 5 Jul 2013 04:16:03 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r654G3BX077320;
 Fri, 5 Jul 2013 04:16:03 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201307050416.r654G3BX077320@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 5 Jul 2013 04:16:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252766 -
 stable/9/cddl/contrib/opensolaris/lib/libzfs/common
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 04:16:03 -0000

Author: delphij
Date: Fri Jul  5 04:16:03 2013
New Revision: 252766
URL: http://svnweb.freebsd.org/changeset/base/252766

Log:
  MFC r252218:
  
  Diff reduction against Illumos, no real change to code itself.
  
  This marks vendor branch revision 252213 as merged, the actual code was
  committed in r245479.

Modified:
  stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
Directory Properties:
  stable/9/cddl/contrib/opensolaris/   (props changed)
  stable/9/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
==============================================================================
--- stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Fri Jul  5 04:11:34 2013	(r252765)
+++ stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c	Fri Jul  5 04:16:03 2013	(r252766)
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
 /*