CommitterDave Eddy (1)
AuthorDave Eddy (1)
Branchesvminfod (1)


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

by Dave Eddy on ⎇
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
DeltaFile
+215-66src/vm/node_modules/VM.js
+158-3src/vm/node_modules/proptable.js
+42-32src/vm/sbin/vmadmd.js
+37-20src/vm/tests/test-vmload-datasets.js
+19-16src/vm/lib/metadata/agent.js
+12-4src/vm/node_modules/vmload/index.js
+14-1src/sysinfo
+5-3src/img/lib/imgadm.js
+6-2src/vm/node_modules/vmload/vmload-datasets.js
+4-3src/vm/sbin/vmadm.js
+6-0overlay/generic/usr/share/bhyve/README
+3-3src/vm/sbin/vmdf.js
+4-2src/vm/node_modules/expander.js
+2-0overlay/generic/manifest
+0-0overlay/generic/usr/share/bhyve/uefi-csm-rom.bin
+527-15515 files

UnifiedSplitRaw