diff options
| author | delphij <delphij@FreeBSD.org> | 2009-12-28 22:15:11 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-12-28 22:15:11 +0000 |
| commit | 2414a09002c0b7080b6044e995d127de758f3e12 (patch) | |
| tree | 1430d12f92f54e2d6f42cd1c36726627c2427969 /cddl | |
| parent | 0b0591131cdc07568e203ce41632d17adc436efb (diff) | |
| download | FreeBSD-src-2414a09002c0b7080b6044e995d127de758f3e12.zip FreeBSD-src-2414a09002c0b7080b6044e995d127de758f3e12.tar.gz | |
Apply OpenSolaris revision 8012 which brings our zpool to version 14,
making it possible for zpools created on OpenSolaris 2009.06 be used
on FreeBSD.
PR: kern/141800
Submitted by: mm
Reviewed by: pjd, trasz
Obtained from: OpenSolaris
MFC after: 2 weeks
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c index 2388df9..2970371 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c @@ -3488,6 +3488,8 @@ zpool_do_upgrade(int argc, char **argv) (void) printf(gettext(" 11 Improved scrub performance\n")); (void) printf(gettext(" 12 Snapshot properties\n")); (void) printf(gettext(" 13 snapused property\n")); + (void) printf(gettext(" 14 passthrough-x aclinherit " + "support\n")); (void) printf(gettext("For more information on a particular " "version, including supported releases, see:\n\n")); (void) printf("http://www.opensolaris.org/os/community/zfs/" |
