SmartOS/live 17d6b26 — src/img CHANGES.md package.json, src/img/lib imgadm.js cli.js
Merge branch 'master' into vminfod
Delta | File | |
---|---|---|
+484 | -333 | src/vm/tests/test-vmload-datasets.js |
+33 | -3 | src/img/lib/imgadm.js |
+8 | -1 | src/img/lib/cli.js |
+7 | -0 | src/img/man/imgadm.1m.md |
+1 | -5 | src/vm/node_modules/vmload/vmload-datasets.js |
+5 | -0 | src/img/CHANGES.md |
+1 | -1 | src/img/package.json |
+539 | -343 | 7 files |