SmartOS/live abbef4f — overlay/generic/etc driver_aliases, src/img CHANGES.md package.json
Merge branch 'master' into vminfod
| Delta | File | |
|---|---|---|
| +8 | -3 | src/img/lib/imgadm.js |
| +10 | -0 | src/img/CHANGES.md |
| +1 | -1 | src/img/package.json |
| +1 | -0 | overlay/generic/etc/driver_aliases |
| +20 | -4 | 4 files |
