SmartOS/live fb2f1ac — man/src sysinfo.1m.md, src sysinfo
Merge branch 'master' into vminfod
Conflicts:
src/vm/node_modules/VM.js
| Delta | File | |
|---|---|---|
| +136 | -94 | src/vm/node_modules/VM.js |
| +14 | -0 | man/src/sysinfo.1m.md |
| +8 | -0 | src/sysinfo |
| +4 | -0 | src/vm/node_modules/proptable.js |
| +162 | -94 | 4 files |
