aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/agent/snmpa.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-01-20 13:52:09 +0100
committerMicael Karlberg <[email protected]>2012-01-20 13:52:09 +0100
commita40219d66d90508775cf801ec5e2b1ffcef4124e (patch)
treef0917c7d52fe841d670b7846cc5d8d7136cb3d08 /lib/snmp/src/agent/snmpa.erl
parentef4af949a1f946c965997957e10cb638e7d01c22 (diff)
parentdda02f0e90a72620745878e4834849029f3e616d (diff)
downloadotp-a40219d66d90508775cf801ec5e2b1ffcef4124e.tar.gz
otp-a40219d66d90508775cf801ec5e2b1ffcef4124e.tar.bz2
otp-a40219d66d90508775cf801ec5e2b1ffcef4124e.zip
Merge branch 'bmk/snmp/agent/update_mibs_cache_funcs/OTP-9868' into bmk/snmp/snmp4173_integration/r13
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/src/agent/snmpa.erl')
-rw-r--r--lib/snmp/src/agent/snmpa.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl
index 87b191caed..5ff0883be3 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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
@@ -363,7 +363,7 @@ update_mibs_cache_age(Agent, Age) ->
update_mibs_cache_gclimit(GcLimit) ->
- update_mibs_cache_age(snmp_master_agent, GcLimit).
+ update_mibs_cache_gclimit(snmp_master_agent, GcLimit).
update_mibs_cache_gclimit(Agent, GcLimit) ->
snmpa_agent:update_mibs_cache_gclimit(Agent, GcLimit).