diff options
| author | Micael Karlberg <[email protected]> | 2012-02-23 12:31:15 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-02-23 12:31:15 +0100 |
| commit | c0b7870b8df464ab3d62ae1291a4bc9f73bf1081 (patch) | |
| tree | 3ef064e50bdfea5ec914281fee62ca477edd1620 /lib | |
| parent | 60cd62388da64e3efc0143529be0a72436fc801e (diff) | |
| parent | f40a7e885398219382757362dc0eb3b73719c34a (diff) | |
| download | otp-c0b7870b8df464ab3d62ae1291a4bc9f73bf1081.tar.gz otp-c0b7870b8df464ab3d62ae1291a4bc9f73bf1081.tar.bz2 otp-c0b7870b8df464ab3d62ae1291a4bc9f73bf1081.zip | |
Merge branch 'bmk/snmp/unused_variables/r15/20120214' into bmk/snmp/snmp422_integration/r15
Conflicts:
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/snmp/src/agent/snmpa_agent.erl | 2 | ||||
| -rw-r--r-- | lib/snmp/src/agent/snmpa_local_db.erl | 4 | ||||
| -rw-r--r-- | lib/snmp/src/agent/snmpa_mib.erl | 2 | ||||
| -rw-r--r-- | lib/snmp/src/app/snmp.appup.src | 12 |
4 files changed, 14 insertions, 6 deletions
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl index 9cc986cf47..9d30e332f1 100644 --- a/lib/snmp/src/agent/snmpa_agent.erl +++ b/lib/snmp/src/agent/snmpa_agent.erl @@ -1281,7 +1281,7 @@ handle_call({backup, BackupDir}, From, #state{backup = undefined} = S) -> ?vtrace("backup server: ~p", [BackupServer]), {noreply, S#state{backup = {BackupServer, From}}}; -handle_call({backup, _BackupDir}, From, #state{backup = Backup} = S) -> +handle_call({backup, _BackupDir}, _From, #state{backup = Backup} = S) -> ?vinfo("backup already in progress: ~p", [Backup]), {reply, {error, backup_in_progress}, S}; diff --git a/lib/snmp/src/agent/snmpa_local_db.erl b/lib/snmp/src/agent/snmpa_local_db.erl index 1ec8dd3874..2c0cad807a 100644 --- a/lib/snmp/src/agent/snmpa_local_db.erl +++ b/lib/snmp/src/agent/snmpa_local_db.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -515,7 +515,7 @@ handle_call({backup, BackupDir}, From, {reply, Error, State} end; -handle_call({backup, _BackupDir}, From, #state{backup = Backup} = S) -> +handle_call({backup, _BackupDir}, _From, #state{backup = Backup} = S) -> ?vinfo("backup already in progress: ~p", [Backup]), {reply, {error, backup_in_progress}, S}; diff --git a/lib/snmp/src/agent/snmpa_mib.erl b/lib/snmp/src/agent/snmpa_mib.erl index 574467d38f..575a018c0c 100644 --- a/lib/snmp/src/agent/snmpa_mib.erl +++ b/lib/snmp/src/agent/snmpa_mib.erl @@ -580,7 +580,7 @@ handle_call({backup, BackupDir}, From, {reply, Error, State} end; -handle_call({backup, _BackupDir}, From, #state{backup = Backup} = S) -> +handle_call({backup, _BackupDir}, _From, #state{backup = Backup} = S) -> ?vinfo("backup already in progress: ~p", [Backup]), {reply, {error, backup_in_progress}, S}; diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src index c716e420e7..14b87390c9 100644 --- a/lib/snmp/src/app/snmp.appup.src +++ b/lib/snmp/src/app/snmp.appup.src @@ -30,10 +30,14 @@ {load_module, snmp_log, soft_purge, soft_purge, []}, {load_module, snmp_verbosity, soft_purge, soft_purge, []}, {load_module, snmpm_mpd, soft_purge, soft_purge, []}, + + {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, + {update, snmpa_mib, soft, soft_purge, soft_purge, []}, + {update, snmpa_agent, soft, soft_purge, soft_purge, []}, + {add_module, snmpm_net_if_mt} ] }, - {"4.21.6", [ {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, @@ -212,10 +216,14 @@ {load_module, snmp_log, soft_purge, soft_purge, []}, {load_module, snmp_verbosity, soft_purge, soft_purge, []}, {load_module, snmpm_mpd, soft_purge, soft_purge, []}, + + {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, + {update, snmpa_mib, soft, soft_purge, soft_purge, []}, + {update, snmpa_agent, soft, soft_purge, soft_purge, []}, + {remove, {snmpm_net_if_mt, soft_purge, soft_purge}} ] }, - {"4.21.6", [ {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, |