SmartOS/live fcc49b8overlay/generic/usr/lib/brand/jcommon statechange, overlay/generic/usr/lib/brand/joyent statechange

OS-6863 presetate should enforce zlog-name

SmartOS/live 87be3c9src/vm/node_modules/macaddr/lib macaddr.js, src/vm/node_modules/macaddr/node_modules/assert-plus assert.js

OS-6857 Allow writing linklocal routes using MAC addresses instead of NIC index
Reviewed by: Dave Eddy <dave.eddy at joyent.com>
Reviewed by: Cody Peter Mello <cody.mello at joyent.com>
Approved by: Cody Peter Mello <cody.mello at joyent.com>

SmartOS/live 12bee38src/vm/sbin vminfo.js

vminfo status style

SmartOS/live 75cfdffsrc/vm/sbin vminfo.js

format `vminfo status` output to not be raw JSON
DeltaFile
+79-6src/vm/sbin/vminfo.js
+79-61 files

SmartOS/live e171091overlay/generic/lib/svc/method net-physical, src/node_modules net-boot-config.js

initial changes for net-physical and net-boot-config

SmartOS/live 548662fsrc/vm/tests test-docker.js

bad character from merge

SmartOS/live fdee182src/img CHANGES.md package.json, src/img/lib imgadm.js

Merge branch 'master' into vminfod

Conflicts:
        src/vm/tests/test-docker.js

SmartOS/live 93f9d27src/vm/tests test-docker.js

OS-6887 test-vm "test log archiving" failure: new console.log and platform.log surprised 
test case
Reviewed by: Josh Wilsdon <josh at wilsdon.ca>
Approved by: Josh Wilsdon <josh at wilsdon.ca>

SmartOS/live 8e8d6cfsrc/img CHANGES.md package.json, src/img/lib imgadm.js

OS-5979 imgadm should use the same req_id for requests
Reviewed by: Trent Mick <trentm at gmail.com>
Approved by: Trent Mick <trentm at gmail.com>

SmartOS/live 8d9819esrc sysinfo

Merge branch 'master' into vminfod
DeltaFile
+12-2src/sysinfo
+12-21 files

SmartOS/live f99934asrc/vm/node_modules VM.js, src/vm/tests test-snapshots.js common.js

better error output in test-snapshots

SmartOS/live f163052src/vm/smf system-vminfod

bail out vminfod start script if the process dies

SmartOS/live d0c1abcsrc fswatcher.c, src/vm/lib/metadata agent.js

update block comments

SmartOS/live c6f5e99src sysinfo

OS-6727 bhyve should provide zone UUID to guest via SMBIOS
Reviewed by: Mike Gerdts <mike.gerdts at joyent.com>
Approved by: Mike Gerdts <mike.gerdts at joyent.com>
DeltaFile
+12-2src/sysinfo
+12-21 files

SmartOS/live 2b1c7dcsrc/vm/sbin vmadm.js

fix vmadm vminfod get error code

SmartOS/live f43f180src/vm/node_modules/vminfod client.js, src/vm/sbin vmadm.js

move zoneadm error message to vmadm

SmartOS/live 2cdc6e4src/vm/tests test-queue.js

fix queue idle tests, maxTasks configurable, t.expect properly

SmartOS/live ad5ebe5src/vm/node_modules queue.js, src/vm/tests test-queue.js

queue idle timer tests

SmartOS/live a93cf7dsrc/vm/node_modules zoneevent.js, src/vm/node_modules/vminfod client.js

update license headers (2018)

SmartOS/live d855255src/vm/node_modules VM.js

locking logic for delete/create snapshot
DeltaFile
+153-24src/vm/node_modules/VM.js
+153-241 files

SmartOS/live 68008ebsrc/vm/node_modules/vminfod vminfod.js

more precise vminfod uptime counter

SmartOS/live e1a2e21src/vm/node_modules/vminfod vminfod.js

use utils.isUUID in vminfod

SmartOS/live 96e617csrc/vm/etc vmadm.completion, src/vm/man vmadm.1m.md

Merge branch 'master' into vminfod

Conflicts:
        src/vm/node_modules/vmload/index.js
        src/vm/node_modules/vmload/vmload-zoneadm.js
        src/vm/tests/test-defaults.js
        src/vm/tests/test-send-recv.js

SmartOS/live 64df021src/vm/etc vmadm.completion, src/vm/man vmadm.1m.md

OS-6828 "vmadm sysrq <uuid> nmi" should send NMI to bhyve guest
Reviewed by: Marsell Kukuljevic <marsell at joyent.com>
Approved by: Jason King <jason.king at joyent.com>

SmartOS/live c577f5dsrc/vm/node_modules VM.js

setDockerRestartOpts should lock before VM.load
DeltaFile
+115-70src/vm/node_modules/VM.js
+115-701 files

SmartOS/live a8ef68dsrc/vm/node_modules proptable.js VM.js

OS-6800 bhyve-opts should be bhyve-extra-opts
Reviewed by: Mike Gerdts <mike.gerdts at joyent.com>
Approved by: Mike Gerdts <mike.gerdts at joyent.com>

SmartOS/live 719cfa3overlay/generic/usr/share/bhyve uefi-csm-rom.bin

OS-6823 need uefi-csm-rom.bin with fix for OS-6604
Reviewed by: Jerry Jelinek <jerry.jelinek at joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney at joyent.com>
Approved by: Patrick Mooney <patrick.mooney at joyent.com>

SmartOS/live fde4346src/vm/node_modules/vminfod vminfod.js

add killtimer for event queue idle event in vminfod

SmartOS/live 5693365src/vm/node_modules VM.js

Merge branch 'master' into vminfod

SmartOS/live bd28c9asrc/vm/node_modules/vminfod vminfod.js

add logging around event queue idle

SmartOS/live abf3fa4src/vm/node_modules VM.js

OS-6825 should preserve zhyve.log when archiving log files from deleted bhyve VMs
Reviewed by: Todd Whiteman <todd.whiteman at joyent.com>
Approved by: Todd Whiteman <todd.whiteman at joyent.com>

SmartOS/live af60984src/vm/node_modules queue.js, src/vm/node_modules/vminfod vminfod.js

only refresh vminfod when it is idle

SmartOS/live 8fd4b81src/vm/node_modules VM.js

fixes from bhyve merge

SmartOS/live 17d6b26src/img CHANGES.md, src/img/lib imgadm.js cli.js

Merge branch 'master' into vminfod

SmartOS/live fad37bbsrc/img CHANGES.md package.json, src/img/lib imgadm.js cli.js

TRITON-178 Image creation support for bhyve VM

SmartOS/live 2d7f689src/vm/node_modules/vmload vmload-datasets.js, src/vm/tests test-vmload-datasets.js

OS-6776 rebuild test data for src/vm/tests/test-vmload-datasets.js
Reviewed by: Trent Mick <trentm at gmail.com>
Approved by: Trent Mick <trentm at gmail.com>

SmartOS/live c9d8d9asrc/vm/node_modules VM.js

undefined is not a function

SmartOS/live fb2f1acman/src sysinfo.1m.md, src sysinfo

Merge branch 'master' into vminfod

Conflicts:
        src/vm/node_modules/VM.js

SmartOS/live 67f5376src/vm/node_modules VM.js

fix merge - wrong callback in create_snapshot

SmartOS/live ec37386src/vm/node_modules VM.js

OS-6788 Failed bhyve provision doesn't clean up dataset
Reviewed by: Trent Mick <trentm at gmail.com>
Approved by: Trent Mick <trentm at gmail.com>

SmartOS/live 6b54458src/vm/node_modules VM.js

OS-6742 "vmadm reboot" is not implemented for bhyve
Reviewed by: Dave Eddy <dave.eddy at joyent.com>
Reviewed by: Trent Mick <trentm at gmail.com>
Approved by: Trent Mick <trentm at gmail.com>

SmartOS/live 8fd367dsrc/vm/node_modules proptable.js

OS-6178 Support "routes" for KVM and bhyve instances
Reviewed by: Dan McDonald <danmcd at joyent.com>
Approved by: Josh Wilsdon <josh at wilsdon.ca>

SmartOS/live 56fa0c7src/vm/node_modules VM.js

OS-6745 "vmadm stop" (without -F) is not implemented for bhyve
Reviewed by: Todd Whiteman <todd.whiteman at joyent.com>
Reviewed by: Dave Eddy <dave.eddy at joyent.com>
Approved by: Todd Whiteman <todd.whiteman at joyent.com>

SmartOS/live 0ce9a65man/src sysinfo.1m.md, src sysinfo

OS-6782 add 'Bhyve Max Vcpus' to sysinfo
Reviewed by: Trent Mick <trentm at gmail.com>
Reviewed by: Patrick Mooney <patrick.mooney at joyent.com>
Reviewed by: Dave Eddy <dave.eddy at joyent.com>
Approved by: Trent Mick <trentm at gmail.com>

SmartOS/live f55656bsrc/vm/lib/metadata agent.js, src/vm/node_modules VM.js proptable.js

Merge branch 'master' into vminfod

Conflicts:
        src/vm/lib/metadata/agent.js
        src/vm/node_modules/VM.js
        src/vm/node_modules/expander.js
        src/vm/node_modules/proptable.js
        src/vm/node_modules/vmload/vmload-datasets.js
        src/vm/sbin/vmadm.js
        src/vm/sbin/vmadmd.js

SmartOS/live 0ae9185src zoneevent.js

zoneevent accept -l argument
DeltaFile
+1-1src/zoneevent.js
+1-11 files

SmartOS/live f782274src zoneevent.js, src/vm/node_modules VM.js

zoneevent take arguments

SmartOS/live c616231src/vm/node_modules VM.js proptable.js, src/vm/node_modules/vmload index.js vmload-datasets.js

OS-6753 HVM disk quotas insufficient on larger zvols
Reviewed by: Trent Mick <trentm at gmail.com>
Reviewed by: Mike Gerdts <mike.gerdts at joyent.com>
Approved by: Trent Mick <trentm at gmail.com>

SmartOS/live 65da377overlay/generic manifest, overlay/generic/usr/share/bhyve README uefi-csm-rom.bin

OS-6711 ship bhyve bootrom binary
Reviewed by: Jerry Jelinek <jerry.jelinek at joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek at joyent.com>

SmartOS/live 32f1b47src/vm/node_modules VM.js

OS-6631 Change zfs layout for bhyve VM
OS-6648 when payload is missing image_size, quota is not updated for bhyve's new zfs 
layout