diff options
| author | Erlang/OTP <[email protected]> | 2012-01-20 13:54:11 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2012-01-20 13:54:11 +0100 |
| commit | e0e862b42d508b5112395f41584bed90c74a8a92 (patch) | |
| tree | f0917c7d52fe841d670b7846cc5d8d7136cb3d08 /lib/snmp/src/agent/snmpa.erl | |
| parent | 65db6eb562b0376dd29fc60e9378d7b3b8ac386b (diff) | |
| parent | a40219d66d90508775cf801ec5e2b1ffcef4124e (diff) | |
| download | otp-e0e862b42d508b5112395f41584bed90c74a8a92.tar.gz otp-e0e862b42d508b5112395f41584bed90c74a8a92.tar.bz2 otp-e0e862b42d508b5112395f41584bed90c74a8a92.zip | |
Merge branch 'bmk/snmp/snmp4173_integration/r13' into maint-r13
* bmk/snmp/snmp4173_integration/r13:
[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.erl | 4 |
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). |