aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-27Merge branch 'pgö/observer-edit-table-row/OTP-10225' into maintFredrik Gustafsson
* pgö/observer-edit-table-row/OTP-10225: Make Table Viewer search a bit faster Edit table row in a multiline text dialog Conflicts: lib/observer/src/observer_tv_table.erl
2012-08-27Merge branch 'sze/ssh-auth_methods/OTP-10224' into maintFredrik Gustafsson
* sze/ssh-auth_methods/OTP-10224: Corrected some documentation according to original SSH: Make "auth_methods" server option re-usable
2012-08-27Merge remote branch 'origin/peppe/common_test/misc_test_failures' into maintPeter Andersson
* origin/peppe/common_test/misc_test_failures: Solve problem with registering parallel testcases
2012-08-27Merge remote branch 'origin/peppe/common_test/bad_func_spec' into maintPeter Andersson
* origin/peppe/common_test/bad_func_spec: Fix error in function specification
2012-08-27Merge remote branch 'origin/peppe/common_test/silent_connection_testspec' ↵Peter Andersson
into maint * origin/peppe/common_test/silent_connection_testspec: Add silent_connections term to test specification
2012-08-27Merge remote branch 'upstream/maint' into maintPeter Andersson
2012-08-27Merge branch 'pg/fix-zip-multidisk/OTP-10223' into maintFredrik Gustafsson
* pg/fix-zip-multidisk/OTP-10223: Fix bug where zip archives wrongly have a first disk number set to 1
2012-08-27Merge branch 'lukas/common_test/deep_get_config/OTP-9626' into maintLukas Larsson
* lukas/common_test/deep_get_config/OTP-9626: Add more cross reference links to ct docs Remove config option from common_test args Update user config to use nested tuple keys
2012-08-27Merge branch 'ia/ssl/countryname-utf8-workaround/OTP-10222' into maintIngela Anderton Andin
* ia/ssl/countryname-utf8-workaround/OTP-10222: ssl & public_key: Workaround that some certificates encode countryname as utf8 and close down gracefully if other ASN-1 errors occur.
2012-08-27Merge branch 'bp/fix_mnesia_index_drop/OTP-10220' into maintFredrik Gustafsson
* bp/fix_mnesia_index_drop/OTP-10220: Bumped version nr Prevent index from being corrupted if a nonexistent item is deleted Add tests showing that trying to delete non-existing object may corrupt the table index
2012-08-27Bumped version nrFredrik Gustafsson
2012-08-27Merge branch 'ta/observer-app/OTP-10221' into maintFredrik Gustafsson
* ta/observer-app/OTP-10221: observer: fix app file (Noticed-by: Motiejus Jakstys)
2012-08-27Merge branch 'kr/r15_ssh_test_ipv6_fix/OTP-10219' into maintFredrik Gustafsson
* kr/r15_ssh_test_ipv6_fix/OTP-10219: Fix lib/src/test/ssh_basic_SUITE.erl to fix IPv6 option typos
2012-08-27Merge branch 'pgö/escape-control-chars-tv/OTP-10218' into maintFredrik Gustafsson
* pgö/escape-control-chars-tv/OTP-10218: Fix Table Viewer search crash on new|changed|deleted rows Escape control characters in Table Viewer Fix Table Viewer crash after a 'Found' -> 'Not found' search sequence
2012-08-27Merge branch 'tab/fix-sctp-multihoming-IPv6/OTP-10217' into maintFredrik Gustafsson
* tab/fix-sctp-multihoming-IPv6/OTP-10217: Allow mixed IPv4 and IPv6 addresses to sctp_bindx Add checks for in6addr_any and in6addr_loopback Fix SCTP multihoming inet_drv.c: Set sockaddr lengths in inet_set_[f]address
2012-08-27Merge branch 'bjorn/otp/fix-make_preload/OTP-10201' into maintBjörn Gustavsson
* bjorn/otp/fix-make_preload/OTP-10201: make_preload: Don't fail if Perl's default file encoding is UTF-8
2012-08-27make_preload: Don't fail if Perl's default file encoding is UTF-8Björn Gustavsson
Setting Perl's default encoding for files to UTF-8, for example like this: PERL_UNICODE=DS make would crash the build with a message similar to: form size 1413 greater than size 1237 of module at utils/make_preload line 175, <FILE> chunk 1. Tell Perl to interpret the data in BEAM files as binary by using the binmode() function. The binmode() function existed before Unicode support was added to Perl, which means that make_preload should work even in old versions of Perl. Noticed-by: Aaron Harnly
2012-08-24Merge branch 'siri/common_test/ct_netconfc/OTP-10025' into maintSiri Hansen
* siri/common_test/ct_netconfc/OTP-10025: [common_test] Handle all ssh_cm messages in ct_netconfc:handle_msg/2
2012-08-24Solve problem with registering parallel testcasesPeter Andersson
2012-08-24Merge branch 'peppe/common_test/update_vsn_files' into maintPeter Andersson
* peppe/common_test/update_vsn_files: Update vsn.mk files
2012-08-24Update vsn.mk filesPeter Andersson
2012-08-24Merge branch 'rc/fix-MP-compiler-flag/OTP-10211' into maintFredrik Gustafsson
2012-08-24ssl & public_key: Workaround that some certificates encode countryname as ↵Ingela Anderton Andin
utf8 and close down gracefully if other ASN-1 errors occur. The reason certificate_unknown that is used as ALERT for ASN-1 encoding failure is described as: Some other (unspecified) issue arose in processing the certificate, rendering it unacceptable.
2012-08-24Merge branch 'msp/double_middle_endian/OTP-10209' into maintLukas Larsson
* msp/double_middle_endian/OTP-10209: Configure now assumed normal doubles Revise the autoconf tests for double middle endianness. Add test for floating-point output to float_SUITE. Unbreak floating point on middle-endian machines.
2012-08-24Configure now assumed normal doublesLukas Larsson
2012-08-24Merge branch 'rc/syntax_tools-1.6.8/OTP-10208' into maintFredrik Gustafsson
2012-08-24Merge branch 'mz/odbc-support-param_query/OTP-10206' into maintFredrik Gustafsson
2012-08-24Bumped version nrFredrik Gustafsson
2012-08-24Merge branch 'mz/odbc-support-param_query' into maintFredrik Gustafsson
2012-08-24Add silent_connections term to test specificationPeter Andersson
2012-08-23Merge branch 'sverk/printf-string-precision-bug' into maintSverker Eriksson
* sverk/printf-string-precision-bug: erts: Fix bug in erts_printf for %s with precision
2012-08-23Fix error in function specificationPeter Andersson
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 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 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 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 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 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-23Add more cross reference links to ct docsLukas Larsson
2012-08-23Remove config option from common_test argsLukas Larsson
This is needed because it is no longer ignored by common_test
2012-08-23Update user config to use nested tuple keysLukas Larsson
ct:get_config and ct:require can now use nested tuples to fetch data from user configuration. E.g. ct:get_config({localhost,ip,v4}). This introduces a backwards incompatability with how names are associated with keys when using require/2. E.g. ct:require(a_name,{localhost,ip}) will associate a_name with ip instead of localhost.
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 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 '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 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 '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.