summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorDan McDonald <danmcd@joyent.com>2021-08-18 11:32:58 -0400
committerDan McDonald <danmcd@joyent.com>2021-08-18 11:32:58 -0400
commit7592d4373f888df2586fe68fed485e6911bc1bed (patch)
treeb01a0b0779f9fc0c1f459020bc2dee9655ec42bc /manifest
parentf3fe11ae4095c266424f0708a6bd1672584fa999 (diff)
parent4772ec9f4bc326d705888dcda49bcc395df74999 (diff)
downloadillumos-joyent-7592d4373f888df2586fe68fed485e6911bc1bed.tar.gz
[illumos-gate merge]
commit 4772ec9f4bc326d705888dcda49bcc395df74999 13983 onu could support updating on Helios commit 998cfd7bd13f4dffec51769e903ceec265afce6f 13988 libproc leaks zoneroot commit 9148a91fab5cca2666b01bab18514159f4480f9e 13989 libproc can leak core CTF data commit 50d4d24e9f62b588d2123e06f654ecb230e4857c 13987 libproc could use standard lists Conflicts: manifest
Diffstat (limited to 'manifest')
-rw-r--r--manifest4
1 files changed, 2 insertions, 2 deletions
diff --git a/manifest b/manifest
index b616a1625c..741864df21 100644
--- a/manifest
+++ b/manifest
@@ -10158,7 +10158,6 @@ d usr/lib/mdb/proc/amd64 0755 root sys
f usr/lib/mdb/proc/amd64/ld.so 0555 root sys
f usr/lib/mdb/proc/amd64/libavl.so 0555 root sys
f usr/lib/mdb/proc/amd64/libc.so 0555 root sys
-f usr/lib/mdb/proc/amd64/libcmdutils.so 0555 root sys
f usr/lib/mdb/proc/amd64/libnvpair.so 0555 root sys
f usr/lib/mdb/proc/amd64/libproc.so 0555 root sys
f usr/lib/mdb/proc/amd64/libpython2.6.so 0555 root sys
@@ -10168,6 +10167,7 @@ f usr/lib/mdb/proc/amd64/libtopo.so 0555 root sys
f usr/lib/mdb/proc/amd64/libumem.so 0555 root sys
f usr/lib/mdb/proc/amd64/libuutil.so 0555 root sys
f usr/lib/mdb/proc/amd64/libzpool.so 0555 root sys
+f usr/lib/mdb/proc/amd64/list.so 0555 root sys
f usr/lib/mdb/proc/amd64/mdb_ds.so 0555 root sys
f usr/lib/mdb/proc/amd64/mdb_test.so 0555 root sys
f usr/lib/mdb/proc/eft.so 0555 root sys
@@ -10175,7 +10175,6 @@ f usr/lib/mdb/proc/fmd.so 0555 root sys
f usr/lib/mdb/proc/ld.so 0555 root sys
f usr/lib/mdb/proc/libavl.so 0555 root sys
f usr/lib/mdb/proc/libc.so 0555 root sys
-f usr/lib/mdb/proc/libcmdutils.so 0555 root sys
f usr/lib/mdb/proc/libmlsvc.so 0555 root sys
f usr/lib/mdb/proc/libnvpair.so 0555 root sys
f usr/lib/mdb/proc/libproc.so 0555 root sys
@@ -10186,6 +10185,7 @@ f usr/lib/mdb/proc/libtopo.so 0555 root sys
f usr/lib/mdb/proc/libumem.so 0555 root sys
f usr/lib/mdb/proc/libuutil.so 0555 root sys
f usr/lib/mdb/proc/libzpool.so 0555 root sys
+f usr/lib/mdb/proc/list.so 0555 root sys
f usr/lib/mdb/proc/mdb_ds.so 0555 root sys
f usr/lib/mdb/proc/mdb_test.so 0555 root sys
f usr/lib/mdb/proc/svc.configd.so 0555 root sys