aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-10-13Merge branch 'hans/ssh/cuddle_spec' into maintHans Nilsson
2015-10-13Merge branch 'entropiae/patch-2' into maintHenrik Nord
* entropiae/patch-2: Fixed typo in ets documentation
2015-10-13Fixed typo in ets documentationRiccardo
2015-10-13Merge branch 'RichMorin/patch-1' into maintHenrik Nord
* RichMorin/patch-1: fix capitalization of headings OTP-13044
2015-10-13Merge branch 'scrapinghub/qrilka-patch-1' into maintHenrik Nord
* scrapinghub/qrilka-patch-1: Small misprint OTP-13043
2015-10-13Small misprintKirill Zaborsky
2015-10-13Merge branch 'legoscia/callback-arrow-no-newline' into maintHenrik Nord
* legoscia/callback-arrow-no-newline: Don't add newline after arrow on -callback lines OTP-13042
2015-10-13Merge branch 'kostis/hipe-native-bif-warning' into maintHenrik Nord
* kostis/hipe-native-bif-warning: Take out unused code that results in a gcc warning OTP-13041
2015-10-12Merge branch 'stolen/unified_dist' into maintZandra
OTP-13040 * stolen/unified_dist: kernel: inet6_tcp_dist: reuse inet_tcp_dist code Conflicts: lib/kernel/src/inet_tcp_dist.erl
2015-10-12Merge branch 'hans/ssh/cuddle_docs' into maintHans Nilsson
2015-10-12ssh: polished ssh.xmlHans Nilsson
Some changes in the SSH section at top (supported algorithms). Added links to default_algorithms and preferred_algorithms in the SSH section.
2015-10-12ssh: updatated spec for ssh:daemonHans Nilsson
2015-10-08Merge branch 'hans/ssh/option_dh_gex_limits_ignored/OTP-13029' into maintHans Nilsson
2015-10-08Merge branch 'hans/ssh/ecdsa/OTP-12936' into maintHans Nilsson
2015-10-08ssh: document new pub key algorithmsHans Nilsson
2015-10-08ssh: ECDSA public key implementedHans Nilsson
2015-10-08public_key: Add ssh2 ECDSA pub key handling + test caseHans Nilsson
Added encode/decode for ecdsa public keys in openssh and rfc4716 format. This is for the ssh public key algorithm ecdsa-sha2-*.
2015-10-08ssh: Tests updated for ecdsaHans Nilsson
2015-10-08Merge branch 'tomszilagyi/shell-support-del-home-end' into maintZandra
OTP-12032 * tomszilagyi/shell-support-del-home-end: Erlang shell: Support keys Del, Home and End
2015-10-08Merge branch 'bjorn/kernel/inet_dns/OTP-13027' into maintBjörn Gustavsson
* bjorn/kernel/inet_dns/OTP-13027: Avoid always updating inet_dns in the primary bootstrap
2015-10-08Merge branch 'tuncer/leex-leo-liu-result-field-order' into maintZandra
OTP-13031 * tuncer/leex-leo-liu-result-field-order: yecc: fix file/2 error tuple doc leex: fix file/2 error tuple doc (Reported-by: Leo Liu)
2015-10-07ssh: added dh_gex testsHans Nilsson
2015-10-07Merge branch 'hans/ssh/zlib_openssh/OTP-12759' into maintHans Nilsson
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 'hans/ssh/aes-ctr-modes/OTP-12939' into maintHans Nilsson
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 'lukas/erts/fix_ptab_assert/OTP-13028' into maintLukas Larsson
2015-10-05Avoid always updating inet_dns in the primary bootstrapBjörn Gustavsson
The include file inet_dns_record_adts.hrl is generated by the Perl script inet_dns_record_adts.pl in a non-deterministic way. That is, every time the script is run, the functions will be in a different order. That will cause inet_dns.beam in the primary bootstrap to be updated every time the bootstrap is updated, even though there is no actual code change. Modify the Perl script to sort the keys pulled out from hashes to make the order deterministic.
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-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