diff options
| author | Micael Karlberg <[email protected]> | 2013-02-05 15:12:52 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2013-02-05 15:12:52 +0100 |
| commit | d4c5e795b916485362e5aee780ffe99fee150c89 (patch) | |
| tree | 9c02dfdf06b5a4dc55a7dcb4cd9d8f56d418b40a /lib/snmp/test/test-mibs | |
| parent | 1cbd897c43f0dab1275392a3736e4629c1f80243 (diff) | |
| parent | c4425da5b7cf880b8ca76158e0bfecbf5202a333 (diff) | |
| download | otp-d4c5e795b916485362e5aee780ffe99fee150c89.tar.gz otp-d4c5e795b916485362e5aee780ffe99fee150c89.tar.bz2 otp-d4c5e795b916485362e5aee780ffe99fee150c89.zip | |
Merge branch 'bmk/snmp/compiler/handling_import_of_BITS_in_mibs/r15/OTP-10799' into bmk/snmp/snmp4222_integration/r15
Diffstat (limited to 'lib/snmp/test/test-mibs')
| -rw-r--r-- | lib/snmp/test/test-mibs/RFC1271-MIB.mib | 3 | ||||
| -rw-r--r-- | lib/snmp/test/test-mibs/RMON2-MIB.mib | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/snmp/test/test-mibs/RFC1271-MIB.mib b/lib/snmp/test/test-mibs/RFC1271-MIB.mib index 25778dede8..b1b3367667 100644 --- a/lib/snmp/test/test-mibs/RFC1271-MIB.mib +++ b/lib/snmp/test/test-mibs/RFC1271-MIB.mib @@ -3,7 +3,8 @@ IMPORTS Counter FROM RFC1155-SMI mib-2,DisplayString FROM RFC1213-MIB - OBJECT-TYPE FROM RFC-1212; + OBJECT-TYPE FROM RFC-1212 + TimeTicks FROM SNMPv2-SMI; -- This MIB module uses the extended OBJECT-TYPE macro as -- defined in [9]. diff --git a/lib/snmp/test/test-mibs/RMON2-MIB.mib b/lib/snmp/test/test-mibs/RMON2-MIB.mib index 827bb38ff9..50c7e6657a 100644 --- a/lib/snmp/test/test-mibs/RMON2-MIB.mib +++ b/lib/snmp/test/test-mibs/RMON2-MIB.mib @@ -1,7 +1,7 @@ RMON2-MIB DEFINITIONS ::= BEGIN IMPORTS MODULE-IDENTITY, OBJECT-TYPE, Counter32, Integer32, - Gauge32, IpAddress, TimeTicks FROM SNMPv2-SMI + Gauge32, IpAddress, TimeTicks, BITS FROM SNMPv2-SMI TEXTUAL-CONVENTION, RowStatus, DisplayString, TimeStamp FROM SNMPv2-TC MODULE-COMPLIANCE, OBJECT-GROUP FROM SNMPv2-CONF |