aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/agent/snmpa.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-01-25 15:21:09 +0100
committerErlang/OTP <[email protected]>2012-01-25 15:21:09 +0100
commit61fa5c03369e9ae6de2b4ae24438c236df93d7cb (patch)
tree4968c9941f15d3562a74b8138ec7e8e9d3daadcc /lib/snmp/src/agent/snmpa.erl
parenta8af5a6bae97ddd7bfc2bcff2e701fa37f47640c (diff)
parent8d8d0a6529874345f3bb69349f573a75a73ea373 (diff)
downloadotp-61fa5c03369e9ae6de2b4ae24438c236df93d7cb.tar.gz
otp-61fa5c03369e9ae6de2b4ae24438c236df93d7cb.tar.bz2
otp-61fa5c03369e9ae6de2b4ae24438c236df93d7cb.zip
Merge branch 'bmk/snmp/snmp4216_integration/r15' into maint-r15
* bmk/snmp/snmp4216_integration/r15: [snmp] Releasse notes cleanup [snmp/agent] Incorrect mib server cache gclimit update [snmp] Updated doc and fixed wrequest create macros [snmp] Be more verbose in the worker procs [snmp] Add a more informative return value when the trap sending fails [snmp] Fixed the mt_trap test-case [snmp] Maximum number of varbinds in a Get-BULK response [snmp] Correted the expect bug in the snmp test utility [snmp] Mostly added some more verbosity stuff
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 50b169e4e7..c400aaddf7 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2004-2011. 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
@@ -547,7 +547,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).