aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-06-01Merge branch 'siri/cuddle-master'Siri Hansen
* siri/cuddle-master: Change ct:sleep to timer:sleep where scaling is not wanted Don't generate ssh key files in netconf client test Ignore data received in break mode in test telnet_server Wait for process to die before next call Retry ct_telnet:get_data if no data is received after short wait Don't throw rest of line when NOP is received in test telnet_server Change ct:sleep to timer:sleep in telnet_server
2016-06-01Merge branch 'lars/seealso-normalize-space/OTP-13639'Lars Thorsen
* lars/seealso-normalize-space/OTP-13639: [erl_docgen] Normalize space for content in a seealso element
2016-06-01[erl_docgen] Normalize space for content in a seealso elementLars Thorsen
2016-06-01Merge branch 'lars/system-doc-xmllint-errors/OTP-13638'Lars Thorsen
* lars/system-doc-xmllint-errors/OTP-13638: [erl_docgen] Fix anchor bug for sections in ref manuals Remove usage of non dtd defined tag (<output>) [erl_docgen] Fix support for quote tag [erl_docgen] Correct the handling of marker tags Correct usage of marker tag [erl_docgen] Add new formatting for header level 4 and below Make it possible to run xmllint target in system documentation
2016-06-01[erl_docgen] Fix anchor bug for sections in ref manualsLars Thorsen
2016-06-01Remove usage of non dtd defined tag (<output>)Lars Thorsen
2016-06-01[erl_docgen] Fix support for quote tagLars Thorsen
2016-06-01[erl_docgen] Correct the handling of marker tagsLars Thorsen
Corrected how the generated html anchor is placed so the section title is visible after jump to the anchor.
2016-06-01Correct usage of marker tagLars Thorsen
2016-06-01[erl_docgen] Add new formatting for header level 4 and belowLars Thorsen
2016-06-01Make it possible to run xmllint target in system documentationLars Thorsen
2016-06-01Merge branch 'ingela/ssl/gen-statem-simplification'Ingela Anderton Andin
* ingela/ssl/gen-statem-simplification: ssl: simplyfy code using gen_statem
2016-06-01Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
2016-06-01ssl: simplyfy code using gen_statemIngela Anderton Andin
2016-06-01ssh: Added timetrap to ssh_benchmark_SUITEHans Nilsson
2016-06-01ssh: replace ?config in testsHans Nilsson
OTP-13565
2016-06-01Merge branch 'hans/ssh/use_open_socket_client/OTP-12860'Hans Nilsson
2016-06-01Merge branch 'hans/ssh/spec_behaviours/OTP-13749'Hans Nilsson
2016-06-01Merge branch 'ingela/ssl/DH/OTP-13636'Ingela Anderton Andin
* ingela/ssl/DH/OTP-13636: ssl: Stronger default DH prime
2016-06-01Merge branch 'legoscia/ssl/tls-dist-more-opts/PR-956/OTP-13429'Raimo Niskanen
* legoscia/ssl/tls-dist-more-opts/PR-956/OTP-13429: Quote curly brackets in command line options Avoid disappearing ETS tables in ssl_dist_SUITE Fix db handle for TLS distribution crl_cache opts Fix ssl_dist_SUITE logging on Windows More logging in ssl_dist_SUITE TLS distribution: crl_check and crl_cache options Allow passing verify_fun for TLS distribution More informative malformed_ssl_dist_opt error
2016-06-01ssl: Stronger default DH primeIngela Anderton Andin
2016-06-01Merge branch 'ingela/ssl/rutime-dep'Ingela Anderton Andin
* ingela/ssl/rutime-dep: ssl: Update runtime dependency due to use of gen_statem
2016-06-01ssl: Update runtime dependency due to use of gen_statemIngela Anderton Andin
2016-06-01Merge branch 'ingela/ssl/cuddle-tests'Ingela Anderton Andin
* ingela/ssl/cuddle-tests: ssl: Avoid two renegotiates ssl: Handle freebsd OpenSSL flavour
2016-06-01ssl: Avoid two renegotiatesIngela Anderton Andin
2016-06-01ssl: Handle freebsd OpenSSL flavourIngela Anderton Andin
The selection of CA cert files in ssl_ECC_SUITE and ssl_test_lib ought to be refactored, it is quite confusing. But use this workaround until we get time to make a refactor.
2016-06-01Update primary bootstrapBjörn Gustavsson
2016-06-01Merge branch 'bjorn/compiler/beam_validator'Björn Gustavsson
* bjorn/compiler/beam_validator: Add additional coverage and smoke test of beam_validator beam_validator: Strengthen validation of match states beam_validator: Use a record representing the match context
2016-06-01Merge branch 'joedevivo/ssl/PR-1063/OTP-13635'Ingela Anderton Andin
* joedevivo/ssl/PR-1063/OTP-13635: ssl:recv timeout() can be 0
2016-06-01Quote curly brackets in command line optionsRaimo Niskanen
Some shells i.e the bash emulating sh regard curly brackets as special characters so e.g {a,b,{}} is expanded to a b {} which is by erlang regarded as 3 arguments instead of a 3-tuple. Other shells e.g Bourne classic /bin/sh, the ash/dash variants and public domain Korn shell all avoid this surprise.
2016-05-31Merge branch 'rickard/etp-commands-fix'Rickard Green
* rickard/etp-commands-fix: Update process state flags in etp-commands
2016-05-31Update process state flags in etp-commandsRickard Green
2016-05-31Merge branch 'sverker/windows-poller-wakeup-race/OTP-13634'Sverker Eriksson
2016-05-31Merge branch 'sverker/gc_rare_map_overflow'Sverker Eriksson
2016-05-31Merge branch 'rickard/off_heap-fix/OTP-13366'Rickard Green
* rickard/off_heap-fix/OTP-13366: Fix bad assertion Properly close message factories in erts_factory_trim_and_close()
2016-05-31Fix bad assertionRickard Green
2016-05-31Properly close message factories in erts_factory_trim_and_close()Rickard Green
2016-05-31erts: Fix possible race in poller wakeup on windowsSverker Eriksson
Similar bug that was fixed for unix in 7bbb207b30360c60fb99653.
2016-05-31Merge branch 'rickard/off_heap-nonsmp-fix/OTP-13366'Rickard Green
* rickard/off_heap-nonsmp-fix/OTP-13366: Do not send on_heap msgs to error logger in non-smp emulator
2016-05-31Merge branch 'rickard/rt-dep-erts-kernel-stdlib-sasl'Rickard Green
* rickard/rt-dep-erts-kernel-stdlib-sasl: Bumped runtime dependencies between erts, kernel, stdlib, sasl
2016-05-31Merge branch 'rickard/ts-platform-id'Rickard Green
* rickard/ts-platform-id: Update TS platform_id with off-heap msgq
2016-05-31Merge branch 'rickard/dirty_nif_SUITE-win-fix'Rickard Green
* rickard/dirty_nif_SUITE-win-fix: Fix windows
2016-05-31Merge branch 'rickard/mv-dirty-reds-count/OTP-13123'Rickard Green
* rickard/mv-dirty-reds-count/OTP-13123: Move dirty reduction count to erts_dirty_process_main()
2016-05-31Merge branch 'vinoski/dirty_process_main/OTP-13123'Rickard Green
* vinoski/dirty_process_main/OTP-13123: Add dirty_process_main function
2016-05-31Merge branch 'rickard/ds-doc/OTP-13123'Rickard Green
* rickard/ds-doc/OTP-13123: minor fixes
2016-05-31Move dirty reduction count to erts_dirty_process_main()Rickard Green
2016-05-31Merge branch 'ingela/ssl/test-timeouts'Ingela Anderton Andin
* ingela/ssl/test-timeouts: ssl: Increase timeouts due to slow test machines
2016-05-31ssl: Increase timeouts due to slow test machinesIngela Anderton Andin
2016-05-31Add dirty_process_main functionSteve Vinoski
Dirty schedulers only execute NIFs, so having them execute the full process_main function isn't necessary. Add dirty_process_main for dirty schedulers to execute instead. Add erts_pre_dirty_nif(), called when preparing to execute a dirty nif. Add more dirty NIF tests to verify that activities requiring the process main lock can succeed when the process is executing a dirty NIF.
2016-05-31Do not send on_heap msgs to error logger in non-smp emulatorRickard Green