diff options
author | Micael Karlberg <[email protected]> | 2012-01-25 15:17:03 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2012-01-25 15:17:03 +0100 |
commit | 8d8d0a6529874345f3bb69349f573a75a73ea373 (patch) | |
tree | 4968c9941f15d3562a74b8138ec7e8e9d3daadcc /lib/snmp/src/agent/snmpa.erl | |
parent | a8af5a6bae97ddd7bfc2bcff2e701fa37f47640c (diff) | |
parent | b55c3d29a3d9efce2ce6548963809fc3b7ab8729 (diff) | |
download | otp-8d8d0a6529874345f3bb69349f573a75a73ea373.tar.gz otp-8d8d0a6529874345f3bb69349f573a75a73ea373.tar.bz2 otp-8d8d0a6529874345f3bb69349f573a75a73ea373.zip |
Merge branch 'maint-r14' into bmk/snmp/snmp4216_integration/r15
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/doc/src/notes_history.xml
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 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). |