aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-10-06Merge branch 'maint-18' into maintHenrik Nord
2015-10-05Merge branch 'lukas/erts/fix_ptab_assert/OTP-13028' into maintLukas Larsson
2015-10-05Updated OTP versionOTP-18.1.1Erlang/OTP
2015-10-05Prepare releaseErlang/OTP
2015-10-05Merge branch 'dgud/mnesia/restore-leak/OTP-13025' into maint-18Erlang/OTP
* dgud/mnesia/restore-leak/OTP-13025: mnesia: Fix mnesia:restore/2 which caused a disk_log leak
2015-10-05Merge branch 'ia/inets/string-not-atom/OTP-13022' into maint-18Erlang/OTP
* ia/inets/string-not-atom/OTP-13022: inets: Use ?MODULE_STRING instead of ?MODULE as argument should be a string
2015-10-05Merge branch 'ia/inets/custom-header-add-default/OTP-13013' into maint-18Erlang/OTP
* ia/inets/custom-header-add-default/OTP-13013: inets: Prepare for release inets: Add new customize function response_default_headers inets: Add behaviour httpd_custom_api
2015-10-02Merge branch 'essen/missing-behavior-absform' into maintZandra
* essen/missing-behavior-absform: Add missing behavior/behaviours to absform docs
2015-10-02Merge branch 'nybek/supervisor_reporting_error' into maintZandra
* nybek/supervisor_reporting_error: Fix supervisor reporting error
2015-10-02mnesia: Fix mnesia:restore/2 which caused a disk_log leakDan Gudmundsson
Introduced a leak of disk_log processes in the rewrite to try-catch.
2015-10-02Merge branch 'travis-ci' into maintHenrik Nord
2015-10-02Update configurationHenrik Nord
Now runs release_docs och the smoke_test Also in paralell
2015-10-02Merge branch 'hans/ssh/update_vsn.mk' into maintHans Nilsson
* hans/ssh/update_vsn.mk: ssh: 4.1->4.2
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-01inets: Prepare for releaseIngela Anderton Andin
2015-10-01ssh: document dh-gex default valuesHans Nilsson
2015-10-01inets: Use ?MODULE_STRING instead of ?MODULE as argument should be a stringIngela Anderton Andin
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-30inets: Add new customize function response_default_headersIngela Anderton Andin
This enables the user to provide default HTTP header values for headers that should always be sent. Note that these values may override built in defaults.
2015-09-30inets: Add behaviour httpd_custom_apiIngela Anderton Andin
Add this now as 18 allows optional callback specs
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-28erts: Remove assertion that ptab is emptyLukas Larsson
Another process may already have been placed in this slot since the free och the process struct can be scheduled for later.
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