| Prepared by: | Dan McDonald on 2021-Oct-25 15:54 -0400 EDT |
|---|---|
| Workspace: | /export/home/danmcd/merge/illumos-joyent (at 4fac9554c4ec) |
| Compare against: | origin/master (git@github.com:/joyent/illumos-joyent at 8670ecf7cf83) |
| Summary of changes: | 96 lines changed: 72 ins; 4 del; 20 mod; 6485 unchg |
| Patch of changes: | zones-merge-changes.patch |
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/cmd/zoneadmd/zoneadmd.c
14019 Allow more control over zone init exit actions (fix mismerge) 14019 Allow more control over zone init exit actions Portions contributed by: Joshua M. Clulow <jmc@joyent.com> Portions contributed by: Andy Fiddaman <andy@omnios.org> Reviewed by: C Fraire <cfraire@me.com> Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com> Approved by: Robert Mustacchi <rm@fingolfin.org>16 lines changed: 14 ins; 1 del; 1 mod; 2933 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/lib/libbrand/common/libbrand.c
14019 Allow more control over zone init exit actions Portions contributed by: Joshua M. Clulow <jmc@joyent.com> Portions contributed by: Andy Fiddaman <andy@omnios.org> Reviewed by: C Fraire <cfraire@me.com> Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com> Approved by: Robert Mustacchi <rm@fingolfin.org>25 lines changed: 21 ins; 0 del; 4 mod; 1053 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/lib/libbrand/common/libbrand.h
14019 Allow more control over zone init exit actions Portions contributed by: Joshua M. Clulow <jmc@joyent.com> Portions contributed by: Andy Fiddaman <andy@omnios.org> Reviewed by: C Fraire <cfraire@me.com> Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com> Approved by: Robert Mustacchi <rm@fingolfin.org>2 lines changed: 2 ins; 0 del; 0 mod; 120 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/lib/libbrand/common/mapfile-vers
14019 Allow more control over zone init exit actions Portions contributed by: Joshua M. Clulow <jmc@joyent.com> Portions contributed by: Andy Fiddaman <andy@omnios.org> Reviewed by: C Fraire <cfraire@me.com> Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com> Approved by: Robert Mustacchi <rm@fingolfin.org>2 lines changed: 2 ins; 0 del; 0 mod; 85 unchg
Cdiffs
Udiffs
Wdiffs
Sdiffs
Frames
Old
New
Patch
Raw
usr/src/lib/libbrand/dtd/brand.dtd.1
man:
Cdiffs
Udiffs
Wdiffs
Sdiffs
Frames
TXT
HTML
Raw
14019 Allow more control over zone init exit actions Portions contributed by: Joshua M. Clulow <jmc@joyent.com> Portions contributed by: Andy Fiddaman <andy@omnios.org> Reviewed by: C Fraire <cfraire@me.com> Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com> Approved by: Robert Mustacchi <rm@fingolfin.org>31 lines changed: 23 ins; 2 del; 6 mod; 647 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/test/zfs-tests/tests/functional/removal/remove_raidz.ksh
14163 zfs-tests: remove_raidz.ksh is broken Reviewed by: Andy Fiddaman <andy@omnios.org> Approved by: Robert Mustacchi <rm@fingolfin.org>4 lines changed: 2 ins; 0 del; 2 mod; 46 unchg
Cdiffs Udiffs Wdiffs Sdiffs Frames Old New Patch Raw usr/src/uts/common/os/exit.c
14019 Allow more control over zone init exit actions (fix mismerge) 14019 Allow more control over zone init exit actions Portions contributed by: Joshua M. Clulow <jmc@joyent.com> Portions contributed by: Andy Fiddaman <andy@omnios.org> Reviewed by: C Fraire <cfraire@me.com> Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com> Approved by: Robert Mustacchi <rm@fingolfin.org>16 lines changed: 8 ins; 1 del; 7 mod; 1601 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.