aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-10-06Merge branch 'maint'Hans Nilsson
2015-10-06Merge branch 'hans/ssh/aes-ctr-modes/OTP-12939' into maintHans Nilsson
2015-10-06Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION
2015-10-06Merge branch 'maint-18' into maintHenrik Nord
2015-10-06ssh: document ctr crypto modeHans Nilsson
2015-10-06ssh: aes192-ctr and aes256-ctr implementedHans Nilsson
2015-10-05Merge branch 'maint'Lukas Larsson
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 'maint'Zandra
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 'kostis/eldap-no-unmatched-returns'Zandra
* kostis/eldap-no-unmatched-returns: Eliminate dialyzer warnings for unmatched_returns
2015-10-02Merge branch 'maint'Zandra
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 'maint'Henrik Nord
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 'maint'Hans Nilsson
* maint: ssh: 4.1->4.2
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 'maint'Hans Nilsson
* maint: ssh: document dh-gex default values ssh: document ecdh and hmac-sha2-512
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'Henrik Nord
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 'maint'Henrik Nord
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 'maint'Henrik Nord
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 'maint'Siri Hansen
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-28Update primary bootstrapBjörn Gustavsson
2015-09-28Merge branch 'bjorn/compiler/misc'Björn Gustavsson
* bjorn/compiler/misc: Move select_val optimization from beam_clean to beam_peep beam_type: Improve optimizations by keeping track of booleans beam_type: Improve optimization by keeping track of integers beam_type: Remove unused clause beam_type: Fix forgotten change of internal representation beam_dead: Improve optimization of literal binary matching beam_dead: Optimize select_val instructions Move out bit syntax optimizations from beam_block sys_core_fold: Extend the list of BIFs that return integers v3_codegen: Optimize matching of the final size-less binary segment Regain full coverage of beam_block