diff options
| author | Micael Karlberg <[email protected]> | 2012-03-05 16:36:43 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-03-05 16:36:43 +0100 |
| commit | 66fada8e8d2b44535d12943b9fb3a149e5648d07 (patch) | |
| tree | c14c1670b2f088a583ce919d4b8ee285f0e45720 /lib/snmp/test/snmp_app_test.erl | |
| parent | d5bec369e7afa999d23c271c104101e47a35fb45 (diff) | |
| parent | c4ef63a7d48b06123fb0b96f38f2a8b7df32fe49 (diff) | |
| download | otp-66fada8e8d2b44535d12943b9fb3a149e5648d07.tar.gz otp-66fada8e8d2b44535d12943b9fb3a149e5648d07.tar.bz2 otp-66fada8e8d2b44535d12943b9fb3a149e5648d07.zip | |
Merge branch 'bmk/snmp/improve_error_handling_reading_config/OTP-9943' into bmk/snmp/snmp422_integration/r15
Conflicts:
lib/snmp/test/snmp_app_test.erl
Diffstat (limited to 'lib/snmp/test/snmp_app_test.erl')
| -rw-r--r-- | lib/snmp/test/snmp_app_test.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/snmp/test/snmp_app_test.erl b/lib/snmp/test/snmp_app_test.erl index 825a232c99..0a320dbbce 100644 --- a/lib/snmp/test/snmp_app_test.erl +++ b/lib/snmp/test/snmp_app_test.erl @@ -23,7 +23,8 @@ -module(snmp_app_test). -export([ - all/0, groups/0, init_per_group/2, end_per_group/2, + all/0, groups/0, + init_per_group/2, end_per_group/2, init_per_suite/1, end_per_suite/1, init_per_testcase/2, end_per_testcase/2, |