SmartOS/live ad299f1 — overlay/generic/lib/svc/method net-physical, src/dockerinit Makefile
Merge branch 'master' into vminfod
Conflicts:
src/vm/node_modules/VM.js
| Delta | File | |
|---|---|---|
| +43 | -14 | src/vm/node_modules/VM.js |
| +29 | -1 | overlay/generic/lib/svc/method/net-physical |
| +5 | -3 | src/img/lib/imgadm.js |
| +5 | -0 | src/img/CHANGES.md |
| +1 | -1 | src/img/package.json |
| +1 | -1 | src/dockerinit/Makefile |
| +1 | -1 | tools/build_live |
| +85 | -21 | 7 files |
