diff options
| author | Micael Karlberg <[email protected]> | 2013-07-04 11:49:12 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2013-07-04 11:49:12 +0200 |
| commit | a020287158a6faedfcacb3c14a4e63e59194dfce (patch) | |
| tree | 22036ff8e004dbdb4ca8b1e010ba531501205eac /lib/snmp/src | |
| parent | e0fa927ff00f7e6a4b25664a10a379e20ab50407 (diff) | |
| parent | 7147e7a36b8a22ba6345356aa786029bab66f4e6 (diff) | |
| download | otp-a020287158a6faedfcacb3c14a4e63e59194dfce.tar.gz otp-a020287158a6faedfcacb3c14a4e63e59194dfce.tar.bz2 otp-a020287158a6faedfcacb3c14a4e63e59194dfce.zip | |
Merge branch 'bmk/snmp/agent/ldb_counter_wrap/OTP-11192' into bmk/snmp/snmp4241_integration/r16
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib/snmp/src')
| -rw-r--r-- | lib/snmp/src/agent/snmpa_local_db.erl | 2 | ||||
| -rw-r--r-- | lib/snmp/src/app/snmp.appup.src | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/lib/snmp/src/agent/snmpa_local_db.erl b/lib/snmp/src/agent/snmpa_local_db.erl index 2c0cad807a..5198c6ec4e 100644 --- a/lib/snmp/src/agent/snmpa_local_db.erl +++ b/lib/snmp/src/agent/snmpa_local_db.erl @@ -583,7 +583,7 @@ handle_cast({variable_inc, Name, Db, N}, State) -> {value, Val} -> Val; _ -> 0 end, - insert(Db, Name, M+N rem 4294967296, State), + insert(Db, Name, (M+N) rem 4294967296, State), {noreply, State}; handle_cast({verbosity,Verbosity}, State) -> diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src index 106fed749d..16b626111b 100644 --- a/lib/snmp/src/app/snmp.appup.src +++ b/lib/snmp/src/app/snmp.appup.src @@ -17,15 +17,24 @@ %% %CopyrightEnd% %% + {"%VSN%", %% ----- U p g r a d e ------------------------------------------------------- +%% Instruction examples: +%% {restart_application, snmp} +%% {load_module, snmp_pdus, soft_purge, soft_purge, []} +%% {update, snmpa_local_db, soft, soft_purge, soft_purge, []} +%% {add_module, snmpm_net_if_mt} + [ {"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, snmp_view_based_acm_mib, soft_purge, soft_purge, + [snmp_conf]}, + {update, snmpa_local_db, soft, soft_purge, soft_purge, []} ] }, {"4.23.1", [{restart_application, snmp}]}, @@ -34,11 +43,16 @@ %% ------D o w n g r a d e --------------------------------------------------- +%% Instruction examples: +%% {remove, {snmpm_net_if_mt, 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, snmp_view_based_acm_mib, soft_purge, soft_purge, + [snmp_conf]}, + {update, snmpa_local_db, soft, soft_purge, soft_purge, []} ] }, {"4.23.1", [{restart_application, snmp}]}, |