Merge branch 'bmk/snmp/bad_decode_TimeTicks/maint/OTP-10132' into bmk/snmp/snmp4221_integration

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.appup.src

1 files changed, 37 insertions, 2 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index f34aeddbb9..91dfc50dc9 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -24,11 +24,14 @@
  [
   {"4.22", 
    [
-    {load_module, snmpm, soft_purge, soft_purge, []} 
+    {load_module, snmpm,     soft_purge, soft_purge, []}, 
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.7", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -55,6 +58,8 @@
   }, 
   {"4.21.6",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -81,6 +86,8 @@
   },
   {"4.21.5",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -112,6 +119,8 @@
   },
   {"4.21.4", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -146,6 +155,8 @@
   }, 
   {"4.21.3", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -180,6 +191,8 @@
   }, 
   {"4.21.2", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -216,6 +229,8 @@
   }, 
   {"4.21.1", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -253,6 +268,8 @@
   }, 
   {"4.21", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -295,11 +312,15 @@
  [
   {"4.22", 
    [
-    {load_module, snmpm, soft_purge, soft_purge, []} 
+    {load_module, snmpm,     soft_purge, soft_purge, []}, 
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.7", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -326,6 +347,8 @@
   }, 
   {"4.21.6",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -352,6 +375,8 @@
   },
   {"4.21.5",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -383,6 +408,8 @@
   },
   {"4.21.4", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -417,6 +444,8 @@
   }, 
   {"4.21.3", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -451,6 +480,8 @@
   }, 
   {"4.21.2", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -487,6 +518,8 @@
   }, 
   {"4.21.1", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -524,6 +557,8 @@
   }, 
   {"4.21", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]},