diff options
| author | Xin LI <delphij@FreeBSD.org> | 2013-06-25 21:51:52 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2013-06-25 21:51:52 +0000 |
| commit | 302dc71948b1e19ce41c4e79ea35229955588ea2 (patch) | |
| tree | 274be2c80fdd18de86dc5f343a1107ad7c7af187 /cddl | |
| parent | b5fb43e5727b6307531d8df908ca32882ce60f6d (diff) | |
| parent | 2b24cff063feb18b68cc1b5c090456c2721d9d2d (diff) | |
| download | src-302dc71948b1e19ce41c4e79ea35229955588ea2.tar.gz src-302dc71948b1e19ce41c4e79ea35229955588ea2.zip | |
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
Notes
Notes:
svn path=/head/; revision=252218
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c index 6af5f77d24df..71b27a121401 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. */ /* |