SmartOS/live eb8e45c — . configure, src/vm/common vmtest.js
Merge branch 'master' into vminfod
Conflicts:
src/vm/common/vmtest.js
src/vm/lib/metadata/agent.js
src/vm/node_modules/vmload/index.js
| Delta | File | |
|---|---|---|
| +1,045 | -0 | src/vm/tests/test-routes-joyent-minimal.js |
| +0 | -1,045 | src/vm/tests/test-routes.js |
| +119 | -0 | src/vm/tests/test-routes-lx.js |
| +7 | -2 | src/vm/common/vmtest.js |
| +4 | -2 | configure |
| +2 | -1 | src/vm/node_modules/vmload/index.js |
| +1,177 | -1,050 | 6 files |
