SmartOS/live fdee182 — src/img CHANGES.md package.json, src/img/lib imgadm.js
Merge branch 'master' into vminfod
Conflicts:
src/vm/tests/test-docker.js
| Delta | File | |
|---|---|---|
| +7 | -0 | src/img/lib/imgadm.js |
| +5 | -0 | src/img/lib/sources/imgapi.js |
| +4 | -1 | src/vm/tests/test-docker.js |
| +4 | -0 | src/img/CHANGES.md |
| +1 | -1 | src/img/package.json |
| +21 | -2 | 5 files |
