aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-10-07Merge branch 'maint'Hans Nilsson
2015-10-07Merge branch 'hans/ssh/zlib_openssh/OTP-12759' into maintHans Nilsson
2015-10-06Merge branch 'maint'Sverker Eriksson
2015-10-06Merge branch 'sverk/erts/doc-review' into maintSverker Eriksson
* sverk/erts/doc-review: erts: Spell-check erlang.xml erts: Review newer additions to erlang.xml erts: Review module erlang docs erts: Update module erlang docs erts: Review time correction docs erts: Update erts time correction docs
2015-10-06ssh: doc updateHans Nilsson
2015-10-06ssh: compression tests skipped if alg is not supportedHans Nilsson
2015-10-06ssh: Bug in [email protected] compression fixedHans Nilsson
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-05erts: Spell-check erlang.xmlSverker Eriksson
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-01erts: Review newer additions to erlang.xmlSverker Eriksson
Trying to adopt same style as done by xsipewe in e17e236cd1661bc for later additions.
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-01erts: Review module erlang docsSverker Eriksson
2015-10-01erts: Update module erlang docsxsipewe
Rebased 6ac77046b05cd3cb7b117 on OTP-18.1 Conflicts: erts/doc/src/erlang.xml
2015-10-01erts: Review time correction docsSverker Eriksson
2015-10-01erts: Update erts time correction docsxsipewe
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