aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-10-02ssh: 4.1->4.2Hans Nilsson
2015-10-02Merge branch 'hans/ssh/doc_dh-gex_defaults' into maintHans Nilsson
* hans/ssh/doc_dh-gex_defaults: ssh: document dh-gex default values
2015-10-02Merge branch 'hans/ssh/doc-ecdh_and_hmac512' into maintHans Nilsson
* hans/ssh/doc-ecdh_and_hmac512: ssh: document ecdh and hmac-sha2-512
2015-10-01ssh: document dh-gex default valuesHans Nilsson
2015-10-01Merge branch 'maint-17' into maintHenrik Nord
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/debugger/doc/src/notes.xml lib/debugger/vsn.mk otp_versions.table
2015-10-01ssh: document ecdh and hmac-sha2-512Hans Nilsson
2015-09-30Merge branch 'stevendanna/eunit-doc-timeout' into maintHenrik Nord
* stevendanna/eunit-doc-timeout: Document eunit's default 5 second test timeout OTP-13017
2015-09-30Merge branch 'entropiae/patch-1' into maintHenrik Nord
* entropiae/patch-1: Fixed typo in otp design principles OTP-13017
2015-09-30Merge branch 'legoscia/patch-10' into maintHenrik Nord
* legoscia/patch-10: Fix typos in crypto documentation OTP-13017
2015-09-30Merge branch 'c-rack/fix-list_to_bitstring-example' into maintHenrik Nord
* c-rack/fix-list_to_bitstring-example: Typos in documentation example of list_to_bitstring/1 OTP-13017
2015-09-30Merge branch 'knewter/perspektive' into maintHenrik Nord
* knewter/perspektive: [typo] perspektive -> perspective OTP-13017
2015-09-30Merge branch 'lucafavatella/fix-snmp-doc-typo' into maintHenrik Nord
* lucafavatella/fix-snmp-doc-typo: Fix typo in SNMP MIB in documentation OTP-13017
2015-09-30Merge branch 'siri/ts_lib-get_arg/remove_space/OTP-13015' into maintSiri Hansen
* siri/ts_lib-get_arg/remove_space/OTP-13015: Allow internal spaces in IFEQ test in generated Makefile
2015-09-29Allow internal spaces in IFEQ test in generated MakefileSiri Hansen
When generating Makefile from Makefile.src, ts_lib:get_arg/4 earlier removed all spaces in the extracted argument. The code was probably meant for removing leading and trailing spaces only, and is now corrected to do so.
2015-09-28Merge branch 'hb/typer/fix_bug/OTP-13010' into maintHans Bolinder
* hb/typer/fix_bug/OTP-13010: typer: Fix a bug
2015-09-28typer: Fix a bugHans Bolinder
Instead of outputting a formatted message showing errors found, a core was (often) created.
2015-09-25Merge branch 'hans/ssh/auth_review/OTP-12787' into maintHans Nilsson
Before this merge the ssh application was stateless after the key-exchange phase. To prevent the application to act on messages received in the wrong state more states are introduced. They take care of service requests and later authorization. * hans/ssh/auth_review/OTP-12787: ssh: remove unused filed #ssh.kb_data ssh: new states for keyboard-interactive ssh: new state - service_request
2015-09-25Fixed typo in otp design principlesRiccardo
2015-09-25Fix typos in crypto documentationMagnus Henoch
s/stong_rand_bytes/strong_rand_bytes/, s/bts/bits/
2015-09-24ssh: remove unused filed #ssh.kb_dataHans Nilsson
2015-09-24Fix typo in SNMP MIB in documentationLuca Favatella
2015-09-23Merge branch 'ia/ssl/econnreset-test-cuddle' into maintIngela Anderton Andin
* ia/ssl/econnreset-test-cuddle: ssl: Retry ssl connections on econnreset errors
2015-09-23ssl: Retry ssl connections on econnreset errorsIngela Anderton Andin
To avoid test case failure due to test case setup timing issues. Suspected problem is that the listen queue builds up to quickly in client_unique_session test when running on slow computers.
2015-09-23ssh: new states for keyboard-interactiveHans Nilsson
2015-09-23ssh: new state - service_requestHans Nilsson
2015-09-21Updated OTP versionOTP-18.1Erlang/OTP
2015-09-21Prepare releaseErlang/OTP
2015-09-21Merge branch 'anders/diameter/18.1/OTP-12978' into maintAnders Svensson
* anders/diameter/18.1/OTP-12978: Remove 1.11 release notes
2015-09-21Merge branch 'ia/ssl/cuddle' into maintIngela Anderton Andin
* ia/ssl/cuddle: ssl: listen socket should be set to active false
2015-09-21ssl: listen socket should be set to active falseIngela Anderton Andin
2015-09-21Merge branch 'siri/sasl-vsn-OTP-18.1' into maintBjörn Gustavsson
* siri/sasl-vsn-OTP-18.1: Update sasl vsn to 2.6
2015-09-21Merge branch 'hb/app_vsn' into maintHans Bolinder
* hb/app_vsn: Update application versions
2015-09-20Merge branch 'ia/ssl/soft-upgrade' into maintIngela Anderton Andin
* ia/ssl/soft-upgrade: ssl: Correct soft upgrade test
2015-09-18ssl: Correct soft upgrade testIngela Anderton Andin
Soft upgrade test did not work as expected due to that the upgrade frame work keeps the control of the test case process to itself, so we need a proxy process to receive messages from ssl test framework.
2015-09-18Update application versionsHans Bolinder
2015-09-18Merge branch 'ia/inets/next/version' into maintIngela Anderton Andin
* ia/inets/next/version: inets: Prepare for release
2015-09-18Merge branch 'ia/ssl/cuddle_tests' into maintIngela Anderton Andin
* ia/ssl/cuddle_tests: ssl: Timeout tuning
2015-09-18Merge branch 'dgud/stdlib/fix-file-error_log-leak' into maintDan Gudmundsson
* dgud/stdlib/fix-file-error_log-leak: stdlib: Fix leaking files after error_logger:logfile(close)
2015-09-17ssl: Timeout tuningIngela Anderton Andin
2015-09-17Merge branch 'lukas/erts/ttsl_eintr/OTP-12987' into maintRickard Green
* lukas/erts/ttsl_eintr/OTP-12987: erts: Make sure to deal with EINTR write failures
2015-09-17Remove 1.11 release notesAnders Svensson
These were added manually in merge commit 8c5d719a, but that was wrong: the notes will be generated. Note that OTP-12791 in the comment for commit 5a339bcb is wrong: it's OTP-12891.
2015-09-17Merge branch 'siri/cuddle-maint' into maintSiri Hansen
* siri/cuddle-maint: Exclude ose application from upgrade test
2015-09-17Update sasl vsn to 2.6Siri Hansen
2015-09-17Exclude ose application from upgrade testSiri Hansen
2015-09-17inets: Prepare for releaseIngela Anderton Andin
2015-09-17stdlib: Fix leaking files after error_logger:logfile(close)Dan Gudmundsson
Introduced when changing state from tuple to record.
2015-09-17Merge branch 'goertzenator/enif_make_pid-unused_param' into maintHenrik Nord
* goertzenator/enif_make_pid-unused_param: fix unused parameter warning in enif_make_pid OTP-12989
2015-09-17Merge branch 'mikpe/erts-binary_to_integer-fix' into maintHenrik Nord
* mikpe/erts-binary_to_integer-fix: erts: fix binary_to_integer boundary case OTP-12988
2015-09-17Merge branch 'leoliu/export-catch_exception' into maintHenrik Nord
* leoliu/export-catch_exception: Export shell:catch_exception/1 as documented
2015-09-17Merge branch 'hb/stdlib/update_app_vsn' into maintHans Bolinder
* hb/stdlib/update_app_vsn: stdlib: Update application version