Merge commit 'a058d1cc571af5fbcfe7f1d719df1abbfdb722f3' into merges
commit4c4247bbb63915a5cb7eb20a9c913af6cf34d505
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 13:45:52 +0000 (13 09:45 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 13:45:52 +0000 (13 09:45 -0400)
tree08dd3ae2c0fc5447b769053cfbafc93e39ee2b0f
parent000b7d47f545c37bbae471248293aad6c3930437
parenta058d1cc571af5fbcfe7f1d719df1abbfdb722f3
Merge commit 'a058d1cc571af5fbcfe7f1d719df1abbfdb722f3' into merges
share/man/man8/zfs.8
share/man/man8/zpool.8
usr/src/cmd/cmd-inet/usr.sbin/ipadm/ipadm.c
usr/src/cmd/gss/gssd/gssdtest.c
usr/src/cmd/hal/addons/network-devices/common.c
usr/src/cmd/hal/addons/storage/addon-storage.c
usr/src/cmd/krb5/ldap_util/kdb5_ldap_realm.c
usr/src/cmd/mail/copylet.c
usr/src/cmd/volcheck/volcheck.c
usr/src/cmd/ypcmd/ypserv.c