summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Create CONTRIBUTING.mdbjorn/contributingBjörn Gustavsson2016-12-131-0/+84
* Merge branch 'egil/erl_interface/fix-warning-in-erl_call/OTP-14086' into maintBjörn-Egil Dahlberg2016-12-081-37/+36
|\
| * 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
|\
| * Revert "eldap: update vsn.mk"Hans Nilsson2016-12-061-1/+1
* | Merge branch 'siri/observer/more-port-info/ERL-272/OTP-13948' into maintSiri Hansen2016-12-065-24/+158
|\ \
| * | [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
* | | Merge branch 'megaco/version' into maintIngela Anderton Andin2016-12-061-1/+1
|\ \ \
| * | | Revert "[megaco] Update version" - only test suite updatedIngela Anderton Andin2016-12-061-1/+1
|/ / /
* | | Merge branch 'ingela/inets/httpd-profiles/OTP-14082' into maintIngela Anderton Andin2016-12-062-1/+8
|\ \ \
| * | | inets: Add Profile argument missed by commit fdfda2fab0921d409789174556582db2...Ingela Anderton Andin2016-12-052-1/+8
* | | | Merge branch 'ingela/ssl/next-version' into maintIngela Anderton Andin2016-12-061-1/+1
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | ssl: Implement DTLS state machineIngela Anderton Andin2016-12-0527-1189/+1818
* | | | | | Merge branch 'emj/report-tunnel-errors/PR-1254' into maintIngela Anderton Andin2016-12-051-2/+4
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | [crashdump_viewer] Display abort reason when truncatedSiri Hansen2016-11-303-15/+72
| | |/ / / / / | |/| | | | |
* | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [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
|\ \ \ \ \ \
| * | | | | | [crashdump_viewer] Show correct values for 'Object' and 'Memory'Siri Hansen2016-11-291-6/+1
* | | | | | | Merge branch 'richcarl/mnesia/table_info_order' into maintDan Gudmundsson2016-12-051-3/+4
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use off_heap memory queue for mnesia_tmDan Gudmundsson2016-11-281-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'peppe/common_test/surviving_gl_procs/ERL-287/OTP-14026' into maintPeter Andersson2016-12-022-7/+13
|\ \ \ \ \ \
| * | | | | | Make sure group leader processes terminate properlyPeter Andersson2016-12-022-7/+13
|/ / / / / /
* | | | | | Merge branch 'peppe/common_test/log_header/OTP-14043' into maintPeter Andersson2016-12-024-123/+273
|\ \ \ \ \ \
| * | | | | | Add heading option to log functionsPeter Andersson2016-12-024-123/+273
|/ / / / / /
* | | | | | Merge branch 'peppe/common_test/logging_verbosity/OTP-14044' into maintPeter Andersson2016-12-021-15/+29
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Correct errors in documentation and add more infoPeter Andersson2016-12-021-15/+29
|/ / / / /
View Lorry Controller Status