SmartOS/live d830577 — . configure, src Makefile
Merge branch 'master' into nat-reform
Delta | File | |
---|---|---|
+543 | -491 | src/vm/tests/test-vmload-datasets.js |
+308 | -150 | src/vm/node_modules/vminfod/vminfod.js |
+225 | -0 | src/vm/tests/test-info.js |
+88 | -40 | src/vm/node_modules/VM.js |
+71 | -23 | src/vm/node_modules/vmload/vmload-datasets.js |
+52 | -31 | src/vm/sbin/vmadmd.js |
+58 | -2 | src/vm/node_modules/vmload/index.js |
+14 | -6 | src/vm/node_modules/proptable.js |
+8 | -6 | src/img/test/create.test.js |
+12 | -0 | src/vm/man/vmadm.1m.md |
+3 | -8 | src/vm/sbin/vmadm.js |
+8 | -1 | configure |
+3 | -1 | src/img/test/runtests |
+2 | -1 | src/Makefile |
+1,395 | -760 | 14 files |