[snmp] Updated release notes, ref man, appup and assigned proper version

2 files changed, 14 insertions, 50 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 6edcf7e833..e1bf7692b3 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -29,24 +29,9 @@
 %% {add_module,  snmpm_net_if_mt}
 
  [
-  {"4.24.1", 
-   [
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_agent]}, 
-    {update, snmpa_mib,   soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.24", 
-   [
-    {load_module, snmp_conf,               soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_agent]}, 
-    {update, snmpa_mib,   soft, soft_purge, soft_purge, []}
-   ]
-  }, 
+  {"4.24.2", [{restart_application, snmp}]}, 
+  {"4.24.1", [{restart_application, snmp}]}, 
+  {"4.24",   [{restart_application, snmp}]}, 
   {"4.23.1", [{restart_application, snmp}]}, 
   {"4.23",   [{restart_application, snmp}]}
  ], 
@@ -57,24 +42,9 @@
 %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
 
  [
-  {"4.24.1", 
-   [
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_agent]}, 
-    {update, snmpa_mib,   soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.24", 
-   [
-    {load_module, snmp_conf,               soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_agent]}, 
-    {update, snmpa_mib,   soft, soft_purge, soft_purge, []}
-   ]
-  }, 
+  {"4.24.2", [{restart_application, snmp}]}, 
+  {"4.24.1", [{restart_application, snmp}]}, 
+  {"4.24",   [{restart_application, snmp}]}, 
   {"4.23.1", [{restart_application, snmp}]}, 
   {"4.23",   [{restart_application, snmp}]}
  ]
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index 04ce2c0530..de03c97281 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -343,12 +343,6 @@ validate_loop(Error, _Log, _Write, _PrevTS, _PrevSN) ->
 %% log(Log, Packet, Addr, Port)
 %%-----------------------------------------------------------------
 
--spec log(Log    :: log(), 
-	  Packet :: binary() | {v3_header(), ScopedPDU :: list()}, 
-	  Addr   :: inet:ip_address(), 
-	  Port   :: inet:port_number()) ->
-    ok | {error, Reason :: term()}.
-
 log(#snmp_log{id = Log, seqno = SeqNo}, Packet, Addr, Port) ->
     ?vtrace("log -> entry with"
 	    "~n   Log:  ~p"
@@ -594,14 +588,14 @@ maybe_unblock(Log, true = _Block) ->
     %% 	    "~n   Res:        ~p", [log_status(Log), Res]),
     Res.
 
-log_status(Log) ->
-    Info = disk_log:info(Log),
-    case lists:keysearch(status, 1, Info) of
-	{value, {status, Status}} ->
-	    Status;
-	false ->
-	    undefined
-    end.
+%% log_status(Log) ->
+%%     Info = disk_log:info(Log),
+%%     case lists:keysearch(status, 1, Info) of
+%% 	{value, {status, Status}} ->
+%% 	    Status;
+%% 	false ->
+%% 	    undefined
+%%     end.
 
 
 %% -- do_log_to_text ---