diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-05-18 12:15:12 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-05-18 12:15:12 +0000 |
| commit | 49eb54a21b7e8a194ae7ac1204fa1f9b31b9fb78 (patch) | |
| tree | 89b089ff23e0497d39cc5d862562e71fcda9af53 /usr/src/man | |
| parent | 2df613f7b7aa3978e80f8e63f228b7ed64ea5d5a (diff) | |
| parent | 8dfe5547fbf0979fc1065a8b6fddc1e940a7cf4f (diff) | |
| download | illumos-joyent-49eb54a21b7e8a194ae7ac1204fa1f9b31b9fb78.tar.gz | |
[illumos-gate merge]
commit 8dfe5547fbf0979fc1065a8b6fddc1e940a7cf4f
9539 Make zvol operations use _by_dnode routines
commit f39927996d932d886093624a919a94b0daf5cb83
9511 printf family isn't aware of multibyte decimal point characters (fix regression)
commit 9ee48d48fcedfa1c02bcd16d6abbbfd28b9726c1
8660 mpi code checks return value of void function
commit e87636823fcefbf553fdda979f84ad782e6e2202
9234 reduce apic calibration error by taking multiple measurements
commit 03a4c2f4bfaca30115963b76445279b36468a614
9523 Large alloc in zdb can cause trouble
commit f41179bd376293096297cdc1f32e610d44f65c8b
9521 Add checkpoint field in the default list of the zpool-list man page
commit 7864b8192b8d30471fa2240466d516292e5765b8
9487 Free objects when receiving full stream as clone
commit fa41d87de9ec9000964c605eb01d6dc19e4a1abe
9464 txg_kick() fails to see that we are quiescing, forcing transactions to their next stages without leaving them accumulate changes
commit 221813c13b43ef48330b03725e00edee85108cf1
9442 decrease indirect block size of spacemaps
commit 20596fe40e947343459994c3b1bcb68f7c0df52e
9245 zfs-test failures: slog_013_pos and slog_014_pos
Conflicts:
usr/src/uts/i86pc/sys/apic_common.h
usr/src/uts/i86pc/sys/apic.h
Diffstat (limited to 'usr/src/man')
| -rw-r--r-- | usr/src/man/man1m/zpool.1m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/man/man1m/zpool.1m b/usr/src/man/man1m/zpool.1m index 728f73de9d..1e7b2b8cfc 100644 --- a/usr/src/man/man1m/zpool.1m +++ b/usr/src/man/man1m/zpool.1m @@ -26,7 +26,7 @@ .\" Copyright (c) 2017 Datto Inc. .\" Copyright (c) 2017 George Melikov. All Rights Reserved. .\" -.Dd December 6, 2017 +.Dd April 27, 2018 .Dt ZPOOL 1M .Os .Sh NAME @@ -1450,7 +1450,7 @@ See the .Sx Properties section for a list of valid properties. The default list is -.Cm name , size , allocated , free , expandsize , fragmentation , capacity , +.Cm name , size , allocated , free , checkpoint, expandsize , fragmentation , capacity , .Cm dedupratio , health , altroot . .It Fl p Display numbers in parsable |