Merge commit '82584a069e2e3824df112a1249fa7818c01f9d49'
commita038dd79377883c0869640f793da82ac3d40ef36
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 11 Jul 2018 15:22:08 +0000 (11 11:22 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 11 Jul 2018 16:00:36 +0000 (11 12:00 -0400)
treece322ce1e5f609eb5888c7cb5435d5c2fa4b8245
parent8e046314f11e060834ae54069b43e20209153af8
parent82584a069e2e3824df112a1249fa7818c01f9d49
Merge commit '82584a069e2e3824df112a1249fa7818c01f9d49'
16 files changed:
exception_lists/packaging
share/man/man3nsl/rpc_svc_create.3nsl
share/man/man4/nfs.4
usr/src/cmd/fs.d/nfs/Makefile
usr/src/cmd/fs.d/nfs/mountd/mountd.c
usr/src/cmd/fs.d/nfs/statd/Makefile
usr/src/cmd/fs.d/nfs/statd/sm_svc.c
usr/src/cmd/fs.d/nfs/svc/server.xml
usr/src/cmd/fs.d/nfs/svc/status.xml
usr/src/lib/libc/port/mapfile-vers
usr/src/lib/libc/port/nsl/svc_generic.c
usr/src/lib/libnsl/common/mapfile-vers
usr/src/lib/libshare/nfs/libshare_nfs.c
usr/src/lib/pam_modules/smb/Makefile.com
usr/src/pkg/manifests/system-library.man3nsl.inc
usr/src/uts/common/rpc/svc.h