aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-02-07Merge branch 'bmk/snmp/snmp4222_integration/r15' into maint-r15Erlang/OTP
* bmk/snmp/snmp4222_integration/r15: [snmp/compiler] Improved debug printouts [snmp/compiler] Add test case and test mib [snmp/compiler] Proper release nodes [snmp/compiler] Add the mib (ALARM-MIB) [snmp/compiler] MIB compiler did not handle forward index ref [snmp/compiler] Added test case for BITS import [snmp/compiler] Release notes, appup and proper version [snmp/compiler] Corrected test mibs [snmp/compiler] MIB compiler did not handle import BITS
2013-02-06Prepare releaseErlang/OTP
2013-02-06Merge branch 'bjorn/asn1/open-type-error/OTP-10805' into maint-r15Erlang/OTP
* bjorn/asn1/open-type-error/OTP-10805: asn1_erl_nif: Correct broken length encoding asn1_SUITE: Mend broken test_modified_x420/1
2013-02-06Merge branch 'bjorn/asn1/extension-addition-groups/OTP-10811' into maint-r15Erlang/OTP
* bjorn/asn1/extension-addition-groups/OTP-10811: Fix a bug for multiple extension addition groups
2013-02-06Merge branch 'bjorn/asn1/test-cases' into maint-r15Erlang/OTP
* bjorn/asn1/test-cases: Don't run testX420/1 on old slow Sparc systems testX420: Pass Options to the ASN.1 compiler
2013-02-06Don't run testX420/1 on old slow Sparc systemsBjörn Gustavsson
One and a half hour is not enough for it to finish.
2013-02-06testX420: Pass Options to the ASN.1 compilerBjörn Gustavsson
When the caller passed the 'der' option, it was ignored.
2013-02-05Merge branch 'bmk/snmp/compiler/forward_table_indexes/r15/OTP-10808' into ↵Micael Karlberg
bmk/snmp/snmp4222_integration/r15
2013-02-05Merge branch ↵Micael Karlberg
'bmk/snmp/compiler/handling_import_of_BITS_in_mibs/r15/OTP-10799' into bmk/snmp/snmp4222_integration/r15
2013-02-05[snmp/compiler] Improved debug printoutsMicael Karlberg
2013-02-05[snmp/compiler] Add test case and test mibMicael Karlberg
2013-02-05[snmp/compiler] Proper release nodesMicael Karlberg
2013-02-05[snmp/compiler] Add the mib (ALARM-MIB)Micael Karlberg
2013-02-05[snmp/compiler] MIB compiler did not handle forward index refMicael Karlberg
The MIB compiler could not handle a table index refering to an object defined later in the MIB.
2013-02-05[snmp/compiler] Added test case for BITS importMicael Karlberg
2013-02-04asn1_erl_nif: Correct broken length encodingBjörn Gustavsson
The ber_bin_v2 backend calls a NIF function to decode all tags and lengths. Even open types that should not be decoded will also be decoded, which makes it necessary to later re-encode the data using a NIF function. The NIF function incorrectly encoded lengths.
2013-02-04asn1_SUITE: Mend broken test_modified_x420/1Björn Gustavsson
The test_modified_x420/1 test case had several problems that prevented it to detect the bugs it was supposed to find: 1) There was a 'catch' at the top-level so that it could never fail. 2) There was a call to the now non-existing ssl_base64 module. 3) It did not test all options for the BER backend. While at it, also clean way the remaining ?line macros and some out-commented code.
2013-02-04Revert "Prepare release"Fredrik Gustafsson
This reverts commit a0e362765d9d4afb0211f49eb787d2139b3eb7be.
2013-02-04[snmp/compiler] Release notes, appup and proper versionMicael Karlberg
2013-02-04[snmp/compiler] Corrected test mibsMicael Karlberg
2013-02-04[snmp/compiler] MIB compiler did not handle import BITSMicael Karlberg
The MIB comp�iler (snmpc) did not hanmdle import (from SNMPv2-SMI) of (pseudo-) type BITS.
2013-01-17Merge tag 'build/maint-r15/2013-01-14_20.31' into maint-r15Fredrik Gustafsson
2013-01-15Update release notesErlang/OTP
2013-01-15Merge branch 'anders/diameter/eval_clause/OTP-10685' into maint-r15Erlang/OTP
* anders/diameter/eval_clause/OTP-10685: vsn -> 1.3.1 Update appup Traffic suite comments plus a minor match tweak Add a testcase Reverse swapped arguments
2013-01-15vsn -> 1.3.1Anders Svensson
2013-01-15Update appupAnders Svensson
2013-01-15Traffic suite comments plus a minor match tweakAnders Svensson
2013-01-15Add a testcaseAnders Svensson
2013-01-14Reverse swapped argumentsAnders Svensson
The fault caused a handle_request callback to fail whenever an eval tuple was returned. Introduced in commit f24adb28.
2013-01-07Fix a bug for multiple extension addition groupsBjörn Gustavsson
Encoding would fail.
2013-01-07Prepare releaseErlang/OTP
2013-01-07Merge branch 'fredrik/ssh/appup-r15b03-patch' into maint-r15Erlang/OTP
* fredrik/ssh/appup-r15b03-patch: Fixed syntax appup ssh Teach Win installer to handle redist on w2012/w8
2013-01-07Fixed syntax appup sshFredrik Gustafsson
2012-12-17Merge branch 'maint-r15' into maintSiri Hansen
2012-12-12Prepare releaseErlang/OTP
2012-12-12Merge branch 'siri/common_test/surefire-for-nci/OTP-10589' into maint-r15Erlang/OTP
* siri/common_test/surefire-for-nci/OTP-10589: [common_test] Add documentation of new url_base option to cth_surefire [common_test] Fix cth_surefire
2012-12-12[common_test] Add documentation of new url_base option to cth_surefireSiri Hansen
2012-12-12[common_test] Fix cth_surefireSiri Hansen
The following corrections/changes are done in the cth_surefire hook: * Earlier there would always be a 'properties' element under the 'testsuites' element. This would exist even if there were now 'property' element inside it. This has been changed so if there are no 'property' elements to display, then there will not be a 'properties' element either. * The XML file will now (unless other is specified) be stored in the top log directory. Earlier, the default directory would be the current working directory for the erlang node, which would mostly, but not always, be the top log directory. * The 'hostname' attribute in the 'testsuite' element would earlier never have the correct value. This has been corrected. * The 'errors' attribute in the 'testsuite' element would earlier display the number of failed testcases. This has been changed and will now always have the value 0, while the 'failures' attribute will show the number of failed testcases. * A new attribute 'skipped' is added to the 'testsuite' element. This will display the number of skipped testcases. These would earlier be included in the number of failed test cases. * The total number of tests displayed by the 'tests' attribute in the 'testsuite' element would earlier include init/end_per_suite and init/end_per_group. This is no longer the case. The 'tests' attribute will now only count "real" test cases. * Earlier, auto skipped test cases would have no value in the 'log' attribute. This is now corrected. * A new attributes 'log' is added to the 'testsuite' element. * A new option named 'url_base' is added for this hook. If this option is used, a new attribute named 'url' will be added to the 'testcase' and 'testsuite' elements. Tests are added for the ct_surefire hook.
2012-12-06Merge tag 'erl_1219' into maintOTP_R15B03-1Björn-Egil Dahlberg
erts: Patch 1219 OTP-10602 Create an erl_crash.dump if no heart exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour changed). Don't create an erl_crash.dump if heart do exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour not changed). This changes the behaviour back to the R15B02 default considering if a beam was running with no heart.
2012-12-06Merge tag 'erl_1218' into maintBjörn-Egil Dahlberg
ssl: Patch 1218 OTP-10600 ssl:ssl_accept/2 timeout is no longer ignored
2012-12-06Prepare releaseErlang/OTP
2012-12-06Merge branch 'egil/fix-crashdump-default/OTP-10602' into maint-r15Erlang/OTP
* egil/fix-crashdump-default/OTP-10602: erts: Change default of erl_crash.dump
2012-12-06Update release notesErlang/OTP
2012-12-06Merge branch 'egil/ia/ssl/accept-timeout/OTP-10600' into maint-r15Erlang/OTP
* egil/ia/ssl/accept-timeout/OTP-10600: ssl: Prepare for release ssl: Export sslsocket() dialyzer type ssl: Cancel non expired timers ssl: Fix recv after timeout expired ssl: Timeout handling changed so that the fsm-process will terminate if the ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires.
2012-12-06ssl: Prepare for releaseIngela Anderton Andin
2012-12-06ssl: Export sslsocket() dialyzer typeIngela Anderton Andin
2012-12-06ssl: Cancel non expired timersIngela Anderton Andin
2012-12-06ssl: Fix recv after timeout expiredIngela Anderton Andin
Reset state so that "recv data" is not sent as "active data" after a recv timed out and no new recv has been called.
2012-12-06ssl: Timeout handling changed so that the fsm-process will terminate if the ↵Ingela Anderton Andin
ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires. Add missing function clause to handle timeout during handshake. The missing clause had the effect that the timeout was wrongly discarded. Also add an extra test case for the recv timeout in addition to the one in ssl_packet_SUITE. The missing functions clause was introduced in 8a789189. This commit changed the timeout implementation, the previous implememtation could cause other type of problems as the timeout was client side.
2012-11-30erts: Change default of erl_crash.dumpBjörn-Egil Dahlberg
* Create an erl_crash.dump if no heart exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour changed) * Don't create an erl_crash.dump if heart do exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour not changed) This changes the behaviour back to the R15B02 default considering if a beam was running with no heart. The motivation is that we want a fast heart to fast restart erlang if it crashes but to be able to get non-truncated erl_crash.dumps via setting ERL_CRASH_DUMP_SECONDS if we so desire.