summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CONTRIBUTING.mdbjorn/contributing-1Björn Gustavsson2016-12-131-2/+1
| | | | | Turns out that we must use setq-default. Correct unbalanced parenthesis in the hook.
* Update CONTRIBUTING.mdBjörn Gustavsson2016-12-131-0/+12
|
* Update CONTRIBUTING.mdBjörn Gustavsson2016-12-131-2/+5
| | | Add clearer instructions for Emacs.
* Update CONTRIBUTING.mdBjörn Gustavsson2016-12-131-1/+1
|
* Update CONTRIBUTING.mdBjörn Gustavsson2016-12-131-5/+5
|
* Create CONTRIBUTING.mdBjörn Gustavsson2016-12-131-0/+84
| | | | | According to https://help.github.com/articles/setting-guidelines-for-repository-contributors, a link to a file named CONTRIBUTING.md will be shown when someone is about to create a pull request. That is more visible than our Wiki pages that are easy to miss. Create the CONTRIBUTING.md file, based on the existing Wiki page https://github.com/erlang/otp/wiki/Contribution-Guidelines.
* Merge branch 'egil/erl_interface/fix-warning-in-erl_call/OTP-14086' into maintBjörn-Egil Dahlberg2016-12-081-37/+36
|\ | | | | | | | | * egil/erl_interface/fix-warning-in-erl_call/OTP-14086: erl_interface: Fix compile warning in erl_call
| * erl_interface: Fix compile warning in erl_callBjörn-Egil Dahlberg2016-12-071-37/+36
| |
* | Update preloaded modulesErlang/OTP2016-12-0714-0/+0
| |
* | Update copyright-yearErlang/OTP2016-12-0796-96/+96
|/
* Merge branch 'hans/eldap/prepare_release' into maintHans Nilsson2016-12-061-1/+1
|\ | | | | | | Eldap vsn.mk (version) was updated alhough it shouldn't.
| * Revert "eldap: update vsn.mk"Hans Nilsson2016-12-061-1/+1
| | | | | | | | This reverts commit c9bf308b6e3e1a699d6262bbb5ec829fd7819513.
* | Merge branch 'siri/observer/more-port-info/ERL-272/OTP-13948' into maintSiri Hansen2016-12-065-24/+158
|\ \ | | | | | | | | | | | | | | | | | | * siri/observer/more-port-info/ERL-272/OTP-13948: [observer] Fix update of range in memory allocator graphs [observer] Add more port information [observer] Show monitored ports in process details view
| * | [observer] Fix update of range in memory allocator graphsSiri Hansen2016-12-051-4/+4
| | |
| * | [observer] Add more port informationSiri Hansen2016-12-053-19/+153
| | |
| * | [observer] Show monitored ports in process details viewSiri Hansen2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | This is a bugfix. Prior to this, only monitored processes were listed under "Monitored" in the process details view. Now ports are also shown.
* | | Merge branch 'megaco/version' into maintIngela Anderton Andin2016-12-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * megaco/version: Revert "[megaco] Update version" - only test suite updated
| * | | Revert "[megaco] Update version" - only test suite updatedIngela Anderton Andin2016-12-061-1/+1
|/ / / | | | | | | | | | This reverts commit ae8f00912587cbb8e9ace6660434e921bae9730b.
* | | Merge branch 'ingela/inets/httpd-profiles/OTP-14082' into maintIngela Anderton Andin2016-12-062-1/+8
|\ \ \ | | | | | | | | | | | | | | | | * ingela/inets/httpd-profiles/OTP-14082: inets: Add Profile argument missed by commit fdfda2fab0921d409789174556582db28141448e
| * | | inets: Add Profile argument missed by commit ↵Ingela Anderton Andin2016-12-052-1/+8
| | | | | | | | | | | | | | | | fdfda2fab0921d409789174556582db28141448e
* | | | Merge branch 'ingela/ssl/next-version' into maintIngela Anderton Andin2016-12-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ingela/ssl/next-version: ssl: Prepare for release
| * | | | ssl: Prepare for releaseIngela Anderton Andin2016-12-051-1/+1
| | | | |
* | | | | Merge branch 'ingela/dtls/statem/OTP-12982' into maintIngela Anderton Andin2016-12-0627-1189/+1818
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ingela/dtls/statem/OTP-12982: ssl: Implement DTLS state machine
| * | | | | ssl: Implement DTLS state machineIngela Anderton Andin2016-12-0527-1189/+1818
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beta DTLS, not production ready. Only very basically tested, and not everything in the SPEC is implemented and some things are hard coded that should not be, so this implementation can not be consider secure. Refactor "TLS connection state" and socket handling, to facilitate DTLS implementation. Create dtls "listner" (multiplexor) process that spawns DTLS connection process handlers. Handle DTLS fragmentation. Framework for handling retransmissions. Replay Detection is not implemented yet. Alerts currently always handled as in TLS.
* | | | | | Merge branch 'emj/report-tunnel-errors/PR-1254' into maintIngela Anderton Andin2016-12-051-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * emj/report-tunnel-errors/PR-1254: Report errors from TLS tunnel request to correct process
| * | | | | | Report errors from TLS tunnel request to correct processEric Meadows-Jönsson2016-11-191-2/+4
| | | | | | |
* | | | | | | Merge branch 'ingela/ECC-tests' into maintIngela Anderton Andin2016-12-051-14/+23
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | * ingela/ECC-tests: ssl: Make sure common-test priv_dir is used for test case generated files
| * | | | | | ssl: Make sure common-test priv_dir is used for test case generated filesIngela Anderton Andin2016-11-071-14/+23
| | | | | | |
* | | | | | | Merge branch 'siri/cdv/abort-tag/OTP-14053' into maintSiri Hansen2016-12-053-15/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * siri/cdv/abort-tag/OTP-14053: [crashdump_viewer] Display abort reason when truncated
| * | | | | | | [crashdump_viewer] Display abort reason when truncatedSiri Hansen2016-11-303-15/+72
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a crashdump is truncated due to size limit reached, a new 'abort' tag with reason is added at the end of the crashdump. This reason is now displayed along with the truncated-warning.
* | | | | | | Merge branch 'hans/public_key/prepare_release' into maintHans Nilsson2016-12-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | public_key: update vsn.mkHans Nilsson2016-12-051-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'hans/ssh/prepare_release' into maintHans Nilsson2016-12-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | ssh: update vsn.mkHans Nilsson2016-12-051-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'hans/eldap/prepare_release' into maintHans Nilsson2016-12-051-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | eldap: update vsn.mkHans Nilsson2016-12-051-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'lars/megaco/cuddle-tests/OTP-14075' into maintLars Thorsen2016-12-053-774/+34
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * lars/megaco/cuddle-tests/OTP-14075: [megaco} Update version [megaco] Use the test_server app and appup tests
| * | | | | | [megaco} Update versionLars Thorsen2016-12-051-1/+1
| | | | | | |
| * | | | | | [megaco] Use the test_server app and appup testsLars Thorsen2016-12-052-773/+33
| | | | | | |
* | | | | | | Merge branch 'hans/public_key/cover_spec' into maintHans Nilsson2016-12-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | public_key: exclude asn1 generated module PKCS-FRAME from coverHans Nilsson2016-12-021-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'hans/ssh/cover_spec' into maintHans Nilsson2016-12-051-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | ssh: excluded modules from cover specHans Nilsson2016-12-021-0/+1
| |/ / / / /
* | | | | | Merge branch 'siri/cdv/faulty-column-vals/OTP-14064' into maintSiri Hansen2016-12-051-6/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * siri/cdv/faulty-column-vals/OTP-14064: [crashdump_viewer] Show correct values for 'Object' and 'Memory'
| * | | | | | [crashdump_viewer] Show correct values for 'Object' and 'Memory'Siri Hansen2016-11-291-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bug caused the numer of buckets to be shown in the 'Objects' column, and the number of objects to be shown in the 'Memory' column for ets table in crashdump_viewer. This is now corrected.
* | | | | | | Merge branch 'richcarl/mnesia/table_info_order' into maintDan Gudmundsson2016-12-051-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * richcarl/mnesia/table_info_order: Preserve key order in mnesia:table_info
| * | | | | | | Preserve key order in mnesia:table_infoRichard Carlsson2016-11-181-3/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'dgud/mnesia/off-heap-msgs/OTP-14074' into maintDan Gudmundsson2016-12-051-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | * dgud/mnesia/off-heap-msgs/OTP-14074: Use off_heap memory queue for mnesia_tm
| * | | | | | Use off_heap memory queue for mnesia_tmDan Gudmundsson2016-11-281-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Helps when mnesia_tm gets drowned in dirty_writes from remote node.
* | | | | | Merge branch 'peppe/common_test/surviving_gl_procs/ERL-287/OTP-14026' into maintPeter Andersson2016-12-022-7/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * peppe/common_test/surviving_gl_procs/ERL-287/OTP-14026: Make sure group leader processes terminate properly OTP-14026
View Lorry Controller Status