diff options
| author | Micael Karlberg <[email protected]> | 2012-02-14 12:18:30 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-02-14 12:18:30 +0100 |
| commit | f40a7e885398219382757362dc0eb3b73719c34a (patch) | |
| tree | 669e5962f33afbec338af22264606018e585ce9c /lib/snmp | |
| parent | 0c9547c384ba9d299d4a73bdf2a514c2b47128cd (diff) | |
| parent | e1904d50ebae01d704f998f7873067e8538e8a35 (diff) | |
| download | otp-f40a7e885398219382757362dc0eb3b73719c34a.tar.gz otp-f40a7e885398219382757362dc0eb3b73719c34a.tar.bz2 otp-f40a7e885398219382757362dc0eb3b73719c34a.zip | |
Merge branch 'bmk/snmp/unused_variables/r14/20120214' into bmk/snmp/unused_variables/r15/20120214
Conflicts:
lib/snmp/src/agent/snmpa_local_db.erl
Diffstat (limited to 'lib/snmp')
| -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 | 14 |
4 files changed, 18 insertions, 4 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 c8e5eec6db..2f823a5c2d 100644 --- a/lib/snmp/src/app/snmp.appup.src +++ b/lib/snmp/src/app/snmp.appup.src @@ -22,6 +22,13 @@ %% ----- U p g r a d e ------------------------------------------------------- [ + {"4.21.7", + [ + {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, []} + ] + }, {"4.21.6", [ {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, @@ -200,6 +207,13 @@ %% ------D o w n g r a d e --------------------------------------------------- [ + {"4.21.7", + [ + {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, []} + ] + }, {"4.21.6", [ {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, |