aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-23Merge branch 'maint'Sverker Eriksson
Conflicts: erts/preloaded/ebin/init.beam
2012-08-23Merge branch 'sverk/hipelibs-code_server-crash-maint' into maintSverker Eriksson
* sverk/hipelibs-code_server-crash-maint: Fix init:restart with hipelibs kernel: Disable hipe compilation for hipe_unified_loader
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/parallel_testcases_error' into ↵Peter Andersson
maint * origin/peppe/common_test/parallel_testcases_error: Solve problems with verbosity levels and parallel test cases
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/io_error' into maintPeter Andersson
* origin/peppe/common_test/io_error: Fix IO bug causing CT Hooks to hang at startup
2012-08-23Solve problems with verbosity levels and parallel test casesPeter Andersson
2012-08-23Fix IO bug causing CT Hooks to hang at startupPeter Andersson
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/silent_connection' into maintPeter Andersson
* origin/peppe/common_test/silent_connection: Fix deadlock problem in connection handling Implement silent_connection for ssh Conflicts: lib/common_test/src/ct_gen_conn.erl OTP-9625
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/break_and_continue' into maintPeter Andersson
* origin/peppe/common_test/break_and_continue: Fix error in documentation Implement support for test case execution break/continue Conflicts: lib/common_test/src/ct.erl lib/common_test/src/ct_run.erl OTP-10127 OTP-10172
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/verbosity_level' into maintPeter Andersson
* origin/peppe/common_test/verbosity_level: Fix doc build error Implement verbosity levels and parameter for log printout importance Conflicts: lib/common_test/src/ct_logs.erl lib/common_test/src/ct_run.erl lib/common_test/src/ct_testspec.erl lib/common_test/src/ct_util.hrl lib/common_test/test/Makefile OTP-9625 OTP-10067
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/testspec_updates' into maintPeter Andersson
* origin/peppe/common_test/testspec_updates: Test new testspec functionality and correct bugs Implement constants and new features for test specifications Conflicts: lib/common_test/src/ct_run.erl lib/common_test/test/Makefile OTP-10049 OTP-10089 OTP-10145
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/hook_init_order' into maintPeter Andersson
* origin/peppe/common_test/hook_init_order: Call CT Hook init functions in the correct order OTP-10135
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge branch 'peppe/common_test/table_sorter' into maintPeter Andersson
* peppe/common_test/table_sorter: Fix installation of javascript files on windows Fix installation of javascript files Make it possible to sort the HTML tables Conflicts: lib/common_test/src/ct_util.hrl OTP-9896
2012-08-23Merge branch 'maint'Peter Andersson
2012-08-23Merge remote branch 'origin/peppe/common_test/exit_status' into maintPeter Andersson
* origin/peppe/common_test/exit_status: Implement support for returning valid exit status from ct_run OTP-9865 OTP-10087
2012-08-23Merge branch 'maint'Ingela Anderton Andin
* maint: (50 commits) ssl: Clean up of code thanks to dialyzer ssl: Add missing sslv3 alert ssl: Test suite adjustments ssl & public_key: Prepare for release ssl: Use crypto:strong_rand_bytes if possible ssl & public_key: Add use of more "sha-rsa oids" ssl: Fix inet header option to behave as in inet ssl: TLS 1.2: fix hash and signature handling ssl: TLS 1.2: fix Certificate Request list of Accepted Signatur/Hash combinations ssl: Add Signature Algorithms hello extension from TLS 1.2 ssl: Fix rizzo tests to run as intended ssl: TLS-1.1 and TLS-1.2 support should not be default until R16 ssl: Signture type bug ssl: Add crypto support check (TLS 1.2 require sha256 support) ssl: Dialyzer fixes ssl: IDEA cipher is deprecated by TLS 1.2 ssl: Run relevant tests for all SSL/TLS versions ssl: Add TLS version switches to openssl tests ssl: Enable TLS 1.2 ssl: Enable mac_hash for TLS 1.2 ...
2012-08-23Merge branch 'ia/sslv3-alert/OTP-10196' into maintIngela Anderton Andin
* ia/sslv3-alert/OTP-10196: ssl: Add missing sslv3 alert
2012-08-23Merge branch 'ia/ssl/tls1.1and1.2' into maintIngela Anderton Andin
* ia/ssl/tls1.1and1.2: (46 commits) ssl: Clean up of code thanks to dialyzer ssl: Test suite adjustments ssl & public_key: Prepare for release ssl: Use crypto:strong_rand_bytes if possible ssl & public_key: Add use of more "sha-rsa oids" ssl: Fix inet header option to behave as in inet ssl: TLS 1.2: fix hash and signature handling ssl: TLS 1.2: fix Certificate Request list of Accepted Signatur/Hash combinations ssl: Add Signature Algorithms hello extension from TLS 1.2 ssl: Fix rizzo tests to run as intended ssl: TLS-1.1 and TLS-1.2 support should not be default until R16 ssl: Signture type bug ssl: Add crypto support check (TLS 1.2 require sha256 support) ssl: Dialyzer fixes ssl: IDEA cipher is deprecated by TLS 1.2 ssl: Run relevant tests for all SSL/TLS versions ssl: Add TLS version switches to openssl tests ssl: Enable TLS 1.2 ssl: Enable mac_hash for TLS 1.2 ssl: Implement TLS 1.2 signature support ...
2012-08-23Merge branch 'sverk/ets-test_ms-bug/OTP-10190' into maintSverker Eriksson
* sverk/ets-test_ms-bug/OTP-10190: Fix bug in ets:test_ms/2.
2012-08-23Merge remote branch 'origin/peppe/common_test/ct_hooks_errors' into maintPeter Andersson
* origin/peppe/common_test/ct_hooks_errors: Fix IO printout crash caused by hook function Fix timetrap error in pre-hooks Conflicts: lib/common_test/src/cth_surefire.erl OTP-10050 OTP-10069 OTP-10072
2012-08-23ssl: Clean up of code thanks to dialyzerIngela Anderton Andin
2012-08-23Merge branch 'maint'Ingela Anderton Andin
* maint: Fix assembler comments for hipe on ppc odbc: remove "-" in hostname from generated unique table name
2012-08-23Merge branch 'ia/odbc/test-suite-maint' into maintIngela Anderton Andin
* ia/odbc/test-suite-maint: odbc: remove "-" in hostname from generated unique table name
2012-08-23Merge branch 'sverk/hipe-ppc-assembler-comment' into maintSverker Eriksson
* sverk/hipe-ppc-assembler-comment: Fix assembler comments for hipe on ppc
2012-08-23Merge branch 'maint' of super:otp into maintFredrik Gustafsson
* 'maint' of super:otp: Revert "Merge branch 'nox/compile-column-numbers' into maint" compiler: Warn if the size of a binary segment is invalid Allow non-ASCII characters in Xref filanmes Add powerpc dso xcomp file
2012-08-23Merge branch 'maint'Björn Gustavsson
* maint: compiler: Warn if the size of a binary segment is invalid
2012-08-23Merge branch 'bjorn/compiler/illegal-size/OTP-10197' into maintBjörn Gustavsson
* bjorn/compiler/illegal-size/OTP-10197: compiler: Warn if the size of a binary segment is invalid
2012-08-23Merge branch 'hb/edoc/union_paren/OTP-10195'Hans Bolinder
* hb/edoc/union_paren/OTP-10195: Fix an issue with parentheses and separate values of union types
2012-08-23Merge branch 'hb/dets_bound_key_opt/OTP-10097'Hans Bolinder
* hb/dets_bound_key_opt/OTP-10097: Optimize traversal of Dets tables with bound key
2012-08-23Merge branch 'maint'Hans Bolinder
* maint: Allow non-ASCII characters in Xref filanmes
2012-08-23Merge branch 'hb/tools/xref_filenames/OTP-10192' into maintHans Bolinder
* hb/tools/xref_filenames/OTP-10192: Allow non-ASCII characters in Xref filanmes
2012-08-22Merge branch 'maint'Lukas Larsson
* maint: Add powerpc dso xcomp file
2012-08-22Merge branch 'lukas/erts/xcomp-ppc/OTP-10198' into maintLukas Larsson
* lukas/erts/xcomp-ppc/OTP-10198: Add powerpc dso xcomp file
2012-08-22Merge branch 'maint'Lukas Larsson
* maint: Revert "Merge branch 'nox/compile-column-numbers' into maint"
2012-08-22Revert "Merge branch 'nox/compile-column-numbers' into maint"Lukas Larsson
Column numbers was merged without understanding all the whole story. See mail on erlang-patches for details. This reverts commit df8e67e203b83f95d1e098fec88ad5d0ad840069, reversing changes made to 0c9d90f314f364e5b1301ec89d762baabc57c7aa.
2012-08-22Fix assembler comments for hipe on ppcSverker Eriksson
Change to preprocessor comments to work on all OS.
2012-08-22compiler: Warn if the size of a binary segment is invalidBjörn Gustavsson
The compiler would silently accept and Dialyzer would crash on code like: <<X:(2.5)>> It is never acceptable for Dialyzer to crash. The compiler should at least generate a warning for such code. It is tempting to let the compiler generate an error, but that would mean that code like: Sz = 42.0, <<X:Sz>>. would be possible to compile with optimizations disabled, but not with optimizations enabled. Dialyzer crashes because it calls cerl:bitstr_bitsize/1, which crashes if the type of size for the segment is invalid. The easiest way to avoid that crash is to extend the sanity checks in v3_core to also include the size field of binary segments. That will cause the compiler to issue a warning and to replace the bad binary construction with a call to erlang:error/1. (It also means that Dialyzer will not issue a warning for bad size fields.)
2012-08-22odbc: remove "-" in hostname from generated unique table nameIngela Anderton Andin
2012-08-22Fix an issue with parentheses and separate values of union typesHans Bolinder
Since EDoc 0.7.7 (R14B02) separate values of union types can be annotated. However, the parser has hitherto chosen not to add the necessary parentheses due to backwards compatibility. From this release on code traversing the output of edoc_parser needs to take care of parentheses around separate values of union types. Examples of such code are layout modules and doclet modules. The following example shows annotated values of a union type: -type t() :: (Name1 :: atom()) | (Name2 :: integer()).
2012-08-22ssl: Add missing sslv3 alertIngela Anderton Andin
2012-08-22ssl: Test suite adjustmentsIngela Anderton Andin
2012-08-22ssl & public_key: Prepare for releaseIngela Anderton Andin
Tickets solved by this branch: OTP-8871, OTP-8872 and OTP-9908
2012-08-22ssl: Use crypto:strong_rand_bytes if possibleIngela Anderton Andin