| Prepared by: | Dan McDonald on 2020-Feb-10 08:41 -0500 EST |
|---|---|
| Workspace: | /export/home/danmcd/ws/illumos-joyent (at 2cc502547fe6) |
| Compare against: | origin/master (https://github.com/joyent/illumos-joyent at 78121a0c3d63) |
| Summary of changes: | 27 lines changed: 7 ins; 19 del; 1 mod; 8867 unchg |
| Patch of changes: | ij-merge-cleanup.patch |
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/cmd/fs.d/nfs/mountd/mountd.c
Revert "OS-871 zone stuck in shutting_down - waiting for kernel thread nfsauth_refresh_thread to terminate" This reverts commit 887d2a84c612cea61b6ad544f54cf790cfb9de3e.8 lines changed: 0 ins; 8 del; 0 mod; 3349 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/cmd/fs.d/nfs/nfsd/nfsd.c
Revert "OS-871 zone stuck in shutting_down - waiting for kernel thread nfsauth_refresh_thread to terminate" This reverts commit 887d2a84c612cea61b6ad544f54cf790cfb9de3e.8 lines changed: 0 ins; 8 del; 0 mod; 972 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/cmd/fs.d/nfs/svc/nfs-server
Clean up merge problems with illumos#11083 (nfs-zone)1 line changed: 1 ins; 0 del; 0 mod; 313 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/lib/brand/joyent-minimal/zone/platform.xml
Add sharetab to joyent zones1 line changed: 1 ins; 0 del; 0 mod; 171 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/lib/brand/joyent/zone/manifests
XXX include nfs server manifest in joyent branded zones1 line changed: 1 ins; 0 del; 0 mod; 176 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/lib/brand/joyent/zone/platform.xml
Add sharetab to joyent zones1 line changed: 1 ins; 0 del; 0 mod; 168 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/uts/common/fs/nfs/nfs_auth.c
Clean up merge problems with illumos#11083 (nfs-zone)1 line changed: 0 ins; 1 del; 0 mod; 1614 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/uts/common/fs/nfs/nfs_sys.c
Clean up merge problems with illumos#11083 (nfs-zone)3 lines changed: 1 ins; 2 del; 0 mod; 405 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/uts/common/klm/nlm_impl.h
Clean up merge problems with illumos#11083 (nfs-zone)1 line changed: 1 ins; 0 del; 0 mod; 644 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/uts/common/sys/zone.h
Clean up merge problems with illumos#11083 (nfs-zone)2 lines changed: 1 ins; 0 del; 1 mod; 1055 unchg
This code review page was prepared using /opt/onbld/bin/webrev. Webrev is maintained by the illumos project. The latest version may be obtained here.