From 524046622706f82ee0244247e5a37dc1c966856f Mon Sep 17 00:00:00 2001 From: delphij Date: Tue, 25 Jun 2013 21:51:52 +0000 Subject: 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. MFC after: 1 week --- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cddl') diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c index 6af5f77..71b27a1 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c @@ -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. */ /* -- cgit v1.1