aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-09-29Merge branch 'dev' into majorAnders Svensson
2011-09-29Merge branch 'anders/diameter/testsuites/OTP-9553' into devAnders Svensson
* anders/diameter/testsuites/OTP-9553: Remove forgotten dbg
2011-09-29Remove forgotten dbgAnders Svensson
2011-09-28Merge branch 'dev' into majorAnders Svensson
2011-09-28Merge branch 'anders/diameter/testsuites/OTP-9553' into devAnders Svensson
* anders/diameter/testsuites/OTP-9553: Don't install Emakefile at release_tests
2011-09-28Don't install Emakefile at release_testsAnders Svensson
Emakefile contained compile flags that caused compilation of suites to fail in some cases. common_test will generate an Emakefile and diameter has no need for one of its own.
2011-09-28Merge branch 'dev' into majorHenrik Nord
2011-09-28Merge branch 'rc/eunit-2.2.1' into devHenrik Nord
* rc/eunit-2.2.1: removed some never-matching clauses reported by dialyzer updated author e-mails and homepages removed cvs keywords from files removed files that should not be checked in OTP-9591
2011-09-28Merge branch 'rc/edoc-0.7.9' into devHenrik Nord
* rc/edoc-0.7.9: bumped revision removed some never-matching clauses reported by dialyzer Fix macro expansion in comments following Erlang types URI-escape bytes as two hex digits always (reported by Alfonso De Gregorio) updated author e-mail recognize some more URI schemas in wiki text, in particular https OTP-9590
2011-09-28Merge branch 'dev' into majorRaimo Niskanen
2011-09-28Merge branch 'raimo/sctp-getsetopts-dev/OTP-9544' into devRaimo Niskanen
* raimo/sctp-getsetopts-dev/OTP-9544: erts,kernel: Bugfix - read SCTP socket options from right protocol layer erts: Fix bug SCTP send can only be called from controlling process
2011-09-28Merge remote-tracking branch 'upstream/dev' into majorDan Gudmundsson
2011-09-28Merge branch 'dgud/mnesia/prepare-release' into devDan Gudmundsson
* dgud/mnesia/prepare-release: [mnesia] Prepare release
2011-09-28Merge branch 'dev' into majorSverker Eriksson
2011-09-28Merge branch 'sverker/revert-md2-With-RSA-Encryption' into devSverker Eriksson
* sverker/revert-md2-With-RSA-Encryption: Revert "Prepare for release" Revert "Support md2WithRSAEncryption certificates in public_key" Revert "Support 'md2' hash in crypto:rsa_sign/3 and crypto:rsa_verify/4"
2011-09-28Merge branch 'bjorn/line-numbers/OTP-9468' into majorBjörn Gustavsson
* bjorn/line-numbers/OTP-9468: beam_lib_SUITE: Don't assume that "Abst" is the last chunk test_server: Show line number for caller of test_server:fail()
2011-09-28Merge branch 'bjorn/parallel-make/OTP-9451' into majorBjörn Gustavsson
* bjorn/parallel-make/OTP-9451: ic documentation: Support parallel make system documentation: Support parallel make Support parallel make when running erl_interface tests odbc/c_src/Makefile.in: Support parallel make tools/c_src/Makefile.in: Support parallel make gs: Correct support for parallel make
2011-09-28Merge branch 'dev' into majorBjörn Gustavsson
* dev: distribution_SUITE:bulk_send_bigbig/1: Fail with more information distribution_SUITE: Use unique slave node names beam_lib: Handle rare race in the crypto key server functionality busy_port_SUITE: Avoid crash in register/2 [wx] Re-generate code [wx] Remove optional shadowing clauses [wx] Remove warning [wx] Fix trailing whitespace [wx] Test colors in textctrl [wx] Fix cleanup memory references
2011-09-28Merge branch 'bjorn/stdlib/fix-beam_lib-race/OTP-9586' into devBjörn Gustavsson
* bjorn/stdlib/fix-beam_lib-race/OTP-9586: beam_lib: Handle rare race in the crypto key server functionality
2011-09-28Merge branch 'bjorn/fix-test-cases' into devBjörn Gustavsson
* bjorn/fix-test-cases: distribution_SUITE:bulk_send_bigbig/1: Fail with more information distribution_SUITE: Use unique slave node names busy_port_SUITE: Avoid crash in register/2
2011-09-28[mnesia] Prepare releaseDan Gudmundsson
2011-09-28Merge branch 'dgud/wx/wx-bugs' into devDan Gudmundsson
* dgud/wx/wx-bugs: [wx] Re-generate code [wx] Remove optional shadowing clauses [wx] Remove warning [wx] Fix trailing whitespace [wx] Test colors in textctrl [wx] Fix cleanup memory references
2011-09-28Merge branch 'dev' into majorAnders Svensson
2011-09-28Merge branch 'anders/diameter/release-0.10' into devAnders Svensson
* anders/diameter/release-0.10: Fix make dependency blunder
2011-09-28Merge branch 'dev' into majorIngela Anderton Andin
2011-09-28Merge branch 'ia/ssl/doc-fix' into devIngela Anderton Andin
* ia/ssl/doc-fix: Corrected documentation bug
2011-09-28Fix make dependency blunderAnders Svensson
Missed the dependency of dictionary beams on diameter_exprecs when removing compiler modules from app file. The changed build order then caused the build to fail.
2011-09-28Corrected documentation bugIngela Anderton Andin
2011-09-28Merge remote branch 'upstream/dev' into majorIngela Anderton Andin
* upstream/dev: Both the SSLv3 and TLS 1.0/TLS 1.1 specifications require implementations to ignore data following the ClientHello (i.e., extensions) if they do not understand them. fix unknown ssl extension parsing by changing length from bits to bytes Temporary disable tests on MAC due to issus with the MAC ODBC drivers
2011-09-28Merge branch 'ia/odbc/temp-disable-mac-tests' into devIngela Anderton Andin
* ia/odbc/temp-disable-mac-tests: Temporary disable tests on MAC due to issus with the MAC ODBC drivers
2011-09-28Merge branch 'fix_unknown_ssl_extension_parsing' into devIngela Anderton Andin
* fix_unknown_ssl_extension_parsing: Both the SSLv3 and TLS 1.0/TLS 1.1 specifications require implementations to ignore data following the ClientHello (i.e., extensions) if they do not understand them. fix unknown ssl extension parsing by changing length from bits to bytes
2011-09-28Merge branch 'dev' into majorHans Bolinder
* dev: Improve indentation in manpages
2011-09-28Merge branch 'hb/erl_docgen/man_indentation_fix/OTP-9588' into devHans Bolinder
* hb/erl_docgen/man_indentation_fix/OTP-9588: Improve indentation in manpages
2011-09-28Improve indentation in manpagesHans Bolinder
The indentation after `Warning:' and `Note:' in manpages has been improved.
2011-09-27Merge branch 'dev' into majorAnders Svensson
Conflicts: lib/diameter/src/app/Makefile
2011-09-27Merge branch 'anders/diameter/release-0.10' into devAnders Svensson
* anders/diameter/release-0.10: Example/dbg/comment fixes Don't include compiler/help modules in app Set version to 0.10 and update appup
2011-09-27Example/dbg/comment fixesAnders Svensson
2011-09-27Don't include compiler/help modules in appAnders Svensson
2011-09-27Merge branch 'maint-r14' into devSverker Eriksson
Fake merge.
2011-09-27Both the SSLv3 and TLS 1.0/TLS 1.1 specifications requireIngela Anderton Andin
implementations to ignore data following the ClientHello (i.e., extensions) if they do not understand them. Data not following the protocol format for extensions will be ignored by the last dec_hello_extensions-clause. OTP-8596
2011-09-27Set version to 0.10 and update appupAnders Svensson
2011-09-27Merge branch 'dev' into majorAnders Svensson
2011-09-27Merge branch 'anders/diameter/testsuites/OTP-9553' into devAnders Svensson
* anders/diameter/testsuites/OTP-9553: (23 commits) Explicit {init,end}_per_group/2 to work around ct bug Add relay suite More traffic cases Add traffic suite Use groups for parallel testcase execution Remove gen_sctp suite since it's not diameter-specific Minor macro cleanup Minor diameter_ct simplification Improve xref testcase Don't require GNU sed to fail testsuite targets Generate dependencies makefile Makefile/spec cleanup Remove old test framework Add transport and gen_sctp suites Add watchdog suite Add stats suite Add sync suite Add reg suite Add dict suite, remove session suite Move appup tests into app suite and use systools for both ...
2011-09-27Merge branch 'anders/diameter/send_anything/OTP-9581' into devAnders Svensson
* anders/diameter/send_anything/OTP-9581: Fix sending of messages of arbitrary form
2011-09-27Merge branch 'anders/diameter/relay_behaviour/OTP-9583' into devAnders Svensson
* anders/diameter/relay_behaviour/OTP-9583: Fix and clarify relay behaviour
2011-09-27Merge branch 'anders/diameter/peer_filters/OTP-9580' into devAnders Svensson
* anders/diameter/peer_filters/OTP-9580: Fix and clarify semantics of peer filters
2011-09-27Merge branch 'anders/diameter/logging/OTP-9579' into devAnders Svensson
* anders/diameter/logging/OTP-9579: Makefile dependency fix Remove duplicate info from error report at encode failure Use single format for error_logger reports Fix improper use of error_logger:info_report/2
2011-09-27Merge branch 'anders/diameter/header_folding_error/OTP-9577' into devAnders Svensson
* anders/diameter/header_folding_error/OTP-9577: Fix header folding bug
2011-09-27Merge branch 'anders/diameter/documentation/OTP-9582' into devAnders Svensson
* anders/diameter/documentation/OTP-9582: Minor documentation fixes
2011-09-27Merge branch 'anders/diameter/answer-message_errors/OTP-9578' into devAnders Svensson
* anders/diameter/answer-message_errors/OTP-9578: Fix bugs in sending of answer-message replies