diff options
author | Micael Karlberg <[email protected]> | 2011-04-01 12:10:48 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-04-01 12:10:48 +0200 |
commit | 057911fd21db849ff4f6a9fa28674002945f725f (patch) | |
tree | 3fb17fe63165bd35bfa2a7c60ebce6dc886866f3 /lib | |
parent | 2b46b0e42fe95d99619ffa343537c8468e27295c (diff) | |
parent | 51e89f67ba97074ec87275d50021749a18d004e9 (diff) | |
download | otp-057911fd21db849ff4f6a9fa28674002945f725f.tar.gz otp-057911fd21db849ff4f6a9fa28674002945f725f.tar.bz2 otp-057911fd21db849ff4f6a9fa28674002945f725f.zip |
Merge branch 'bmk/snmp/support_ipv6_transport_address' into bmk/snmp/snmp420_integration
Diffstat (limited to 'lib')
-rw-r--r-- | lib/snmp/src/misc/snmp_misc.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/snmp/src/misc/snmp_misc.erl b/lib/snmp/src/misc/snmp_misc.erl index 2dce76992b..6adef06ab9 100644 --- a/lib/snmp/src/misc/snmp_misc.erl +++ b/lib/snmp/src/misc/snmp_misc.erl @@ -40,7 +40,7 @@ get_option/2, get_option/3, get_sec_level/1, - ip/1, + ip/1, ip/2, is_auth/1, is_BitString/1, is_oid/1, |