SmartOS/live e71f281 — overlay/generic/etc driver_aliases, src/vm/node_modules VM.js
Merge branch 'master' into vminfod
Conflicts:
src/vm/node_modules/VM.js
| Delta | File | |
|---|---|---|
| +21 | -6 | src/vm/node_modules/VM.js |
| +7 | -0 | overlay/generic/etc/driver_aliases |
| +5 | -0 | src/vm/tests/test-net-conflicts.js |
| +33 | -6 | 3 files |
