aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2017-11-16ssl: Resolve merge conflict resolution errorIngela Anderton Andin
2017-11-16Merge branch 'maint'Ingela Anderton Andin
2017-11-16Merge branch 'ingela/ssl/code-enhance' into maintIngela Anderton Andin
2017-11-16ssl: Align code of TLS/DTLS handshake handlingIngela Anderton Andin
2017-11-16ssl: Align code of TLS/DTLS record handlingIngela Anderton Andin
2017-11-16ssl: Align code of main modules implementing the gen_statem behaviourIngela Anderton Andin
2017-11-16dtls: Add state specIngela Anderton Andin
2017-11-15Merge branch 'maint'Hans Bolinder
2017-11-15Merge branch 'hasse/edoc/fix_map_type/OTP-14777' into maintHans Bolinder
2017-11-15Merge pull request #1602 from sirihansen/siri/supervisor/store-children-in-mapSiri Hansen
2017-11-15Merge PR-1605 from sverker/sverker/binary_to_term-used OTP-14780Sverker Eriksson
2017-11-15Merge PR-1621 from margnus1/hipe-literal-tagSverker Eriksson
2017-11-15Merge branch 'maint'Sverker Eriksson
2017-11-15Merge branch 'sverker/test-cuddle' into maintSverker Eriksson
2017-11-14[supervisor] Add test of scaling on start/stop of many childrenSiri Hansen
2017-11-14edoc: The map type is denoted map()Hans Bolinder
2017-11-14Add ignore option to transform_table fun (#1614)Bernard Duggan
2017-11-14Merge branch 'maint'Hans Bolinder
2017-11-14Merge branch 'hasse/dialyzer/fix_crash_msg/OTP-14742' into maintHans Bolinder
2017-11-13Merge pull request #1624 from bjorng/bjorn/add-beam-internal-docBjörn Gustavsson
2017-11-13Update primary bootstrapBjörn Gustavsson
2017-11-13Merge branch 'maint'Björn Gustavsson
2017-11-13Merge branch 'bjorn/compiler/fix-deterministic-attribute/ERL-498' into maintBjörn Gustavsson
2017-11-13Merge branch 'maint'Ingela Anderton Andin
2017-11-13Merge branch 'ingela/ssl/doc-link-fix' into maintIngela Anderton Andin
2017-11-13Document beam_makeopsBjörn Gustavsson
2017-11-13Refuse to load "literals" that can be confused with registersBjörn Gustavsson
2017-11-13ssl: Fix broken link in docIngela Anderton Andin
2017-11-10dialyzer: Display error messages without call stackHans Bolinder
2017-11-10Merge branch 'maint'Ingela Anderton Andin
2017-11-10Merge branch 'maint-20' into maintIngela Anderton Andin
2017-11-10Merge branch 'bjorn/cuddle-with-tests'Björn Gustavsson
2017-11-10Merge branch 'maint'Ingela Anderton Andin
2017-11-10Merge branch 'ingela/snmp/cuddle' into maintIngela Anderton Andin
2017-11-10Merge branch 'maint'Ingela Anderton Andin
2017-11-10Merge branch 'ingela/ssl/engine-API/OTP-14448' into maintIngela Anderton Andin
2017-11-10Merge branch 'maint'Hans Nilsson
2017-11-10Merge branch 'hans/ssh/hostkey_in_engine/OTP-14757' into maintHans Nilsson
2017-11-10ssh: Document engine_key_ref() returned from ssh_server_key:host_key/2Hans Nilsson
2017-11-10ssh: Update ssh_{server|client}_key doc to what it should have beenHans Nilsson
2017-11-10ssh: New test suite for engine-stored keysHans Nilsson
2017-11-10ssh: Update SSH for engine-stored host keysHans Nilsson
2017-11-10crypto: Doc privkey_to_pubkey/2Hans Nilsson
2017-11-10crypto: Extend engine_SUITE with tests of the pub key extraction from priv keysHans Nilsson
2017-11-10crypto: Add privkey_to_pubkey/2 to get the public key from a priv key in an E...Hans Nilsson
2017-11-10Merge branch 'maint'Hans Nilsson
2017-11-10Merge branch 'hans/crypto/engine_pkey_load/OTP-14448' into maintHans Nilsson
2017-11-10crypto: Remove unused 'atom_bad_engine'Hans Nilsson
2017-11-10crypto: Remove 'relasenotes.xml' from doc/src/MakefileHans Nilsson
2017-11-10crypto: Extend engine_SUITE with tests of the pub/priv key fetchesHans Nilsson