CommitterDave Eddy (1)
AuthorDave Eddy (1)
Branchesvminfod (1)


SmartOS/live 1acbf45 — overlay/generic/lib/svc/method mdata-fetch, src Makefile manifest

by Dave Eddy on ⎇
Merge branch 'master' into vminfod

Conflicts:
        src/Makefile
        src/manifest
        src/vm/lib/metadata/agent.js
        src/vm/node_modules/VM.js
        src/vm/node_modules/vmload/index.js
        src/vm/node_modules/zonecfg.js
        src/vm/sbin/vmadmd.js
DeltaFile
+243-0src/lx_hook_postnet/main.c
+79-86src/vm/node_modules/VM.js
+135-0src/lx_hook_postnet/Makefile
+49-27src/vm/sbin/vmadmd.js
+68-3overlay/generic/lib/svc/method/mdata-fetch
+25-24src/vm/node_modules/vmload/index.js
+3-9src/vm/node_modules/zonecfg.js
+4-2src/vm/node_modules/vmload/vmload-datasets.js
+4-2src/Makefile
+3-2src/manifest
+3-2src/vm/lib/metadata/agent.js
+4-0src/vm/node_modules/sysevent-stream.js
+2-1src/dockerinit/src/docker-common.h
+2-0src/lx_hook_postnet/.gitignore
+624-15814 files

UnifiedSplitRaw