aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-12-07Merge branch 'maint'Dan Gudmundsson
* maint: Update copyright-year Conflicts: lib/dialyzer/src/dialyzer.hrl lib/dialyzer/src/dialyzer_options.erl lib/dialyzer/test/opaque_SUITE_data/src/recrec/dialyzer.hrl lib/dialyzer/test/opaque_SUITE_data/src/recrec/dialyzer_races.erl lib/hipe/icode/hipe_icode.erl lib/hipe/main/hipe.erl lib/hipe/main/hipe.hrl.src lib/hipe/main/hipe_main.erl
2016-12-07Update copyright-yearErlang/OTP
2016-12-06Merge branch 'maint'Hans Nilsson
2016-12-06Merge branch 'hans/eldap/prepare_release' into maintHans Nilsson
Eldap vsn.mk (version) was updated alhough it shouldn't.
2016-12-06Revert "eldap: update vsn.mk"Hans Nilsson
This reverts commit c9bf308b6e3e1a699d6262bbb5ec829fd7819513.
2016-12-06Merge branch 'siri/observer/more-port-info/ERL-272/OTP-13948' into maintSiri Hansen
* 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
2016-12-06Merge branch 'maint'Ingela Anderton Andin
2016-12-06Merge branch 'megaco/version' into maintIngela Anderton Andin
* megaco/version: Revert "[megaco] Update version" - only test suite updated
2016-12-06Revert "[megaco] Update version" - only test suite updatedIngela Anderton Andin
This reverts commit ae8f00912587cbb8e9ace6660434e921bae9730b.
2016-12-06Merge branch 'maint'Ingela Anderton Andin
2016-12-06Merge branch 'ingela/inets/httpd-profiles/OTP-14082' into maintIngela Anderton Andin
* ingela/inets/httpd-profiles/OTP-14082: inets: Add Profile argument missed by commit fdfda2fab0921d409789174556582db28141448e
2016-12-06Merge branch 'ingela/ssl/next-version' into maintIngela Anderton Andin
* ingela/ssl/next-version: ssl: Prepare for release
2016-12-06Merge branch 'maint'Ingela Anderton Andin
2016-12-06Merge branch 'ingela/dtls/statem/OTP-12982' into maintIngela Anderton Andin
* ingela/dtls/statem/OTP-12982: ssl: Implement DTLS state machine
2016-12-05Merge branch 'sverker/secret-atom'Sverker Eriksson
2016-12-05Merge branch 'maint'Ingela Anderton Andin
2016-12-05Merge branch 'emj/report-tunnel-errors/PR-1254' into maintIngela Anderton Andin
* emj/report-tunnel-errors/PR-1254: Report errors from TLS tunnel request to correct process
2016-12-05Merge branch 'maint'Ingela Anderton Andin
2016-12-05Merge branch 'ingela/ECC-tests' into maintIngela Anderton Andin
* ingela/ECC-tests: ssl: Make sure common-test priv_dir is used for test case generated files
2016-12-05inets: Add Profile argument missed by commit ↵Ingela Anderton Andin
fdfda2fab0921d409789174556582db28141448e
2016-12-05ssl: Prepare for releaseIngela Anderton Andin
2016-12-05Merge branch 'siri/cdv/abort-tag/OTP-14053' into maintSiri Hansen
* siri/cdv/abort-tag/OTP-14053: [crashdump_viewer] Display abort reason when truncated
2016-12-05Merge branch 'maint'Hans Nilsson
2016-12-05Merge branch 'hans/public_key/prepare_release' into maintHans Nilsson
2016-12-05Merge branch 'hans/ssh/prepare_release' into maintHans Nilsson
2016-12-05Merge branch 'hans/eldap/prepare_release' into maintHans Nilsson
2016-12-05public_key: update vsn.mkHans Nilsson
2016-12-05ssh: update vsn.mkHans Nilsson
2016-12-05eldap: update vsn.mkHans Nilsson
2016-12-05Merge branch 'maint'Lars Thorsen
2016-12-05Merge branch 'lars/megaco/cuddle-tests/OTP-14075' into maintLars Thorsen
* lars/megaco/cuddle-tests/OTP-14075: [megaco} Update version [megaco] Use the test_server app and appup tests
2016-12-05Merge branch 'maint'Hans Nilsson
2016-12-05Merge branch 'hans/public_key/cover_spec' into maintHans Nilsson
2016-12-05Merge branch 'hans/ssh/cover_spec' into maintHans Nilsson
2016-12-05[megaco} Update versionLars Thorsen
2016-12-05[megaco] Use the test_server app and appup testsLars Thorsen
2016-12-05Merge branch 'siri/cdv/faulty-column-vals/OTP-14064' into maintSiri Hansen
* siri/cdv/faulty-column-vals/OTP-14064: [crashdump_viewer] Show correct values for 'Object' and 'Memory'
2016-12-05[observer] Fix update of range in memory allocator graphsSiri Hansen
2016-12-05[observer] Add more port informationSiri Hansen
2016-12-05ssl: Implement DTLS state machineIngela Anderton Andin
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.
2016-12-05Merge branch 'egil/erts/lcnt-nif-driver/OTP-14069'Björn-Egil Dahlberg
* egil/erts/lcnt-nif-driver/OTP-14069: erts: Remove unnecessary 'enable_lcnt' option in locks erts: Fix whitespace errors in lock counter erts: Add driver and nif locks to lcnt
2016-12-05Merge branch 'maint'Dan Gudmundsson
* maint: Use off_heap memory queue for mnesia_tm Preserve key order in mnesia:table_info
2016-12-05Merge branch 'richcarl/mnesia/table_info_order' into maintDan Gudmundsson
* richcarl/mnesia/table_info_order: Preserve key order in mnesia:table_info
2016-12-05Merge branch 'dgud/mnesia/off-heap-msgs/OTP-14074' into maintDan Gudmundsson
* dgud/mnesia/off-heap-msgs/OTP-14074: Use off_heap memory queue for mnesia_tm
2016-12-05Merge branch 'richcarl/stdlib/io_lib_pretty-comments/PR-1228'Hans Bolinder
* richcarl/stdlib/io_lib_pretty-comments/PR-1228: Add comments for understanding io_lib_pretty
2016-12-02erts: Remove unnecessary 'enable_lcnt' option in locksBjörn-Egil Dahlberg
2016-12-02erts: Fix whitespace errors in lock counterBjörn-Egil Dahlberg
2016-12-02erts: Add driver and nif locks to lcntBjörn-Egil Dahlberg
2016-12-02Update primary bootstrapBjörn-Egil Dahlberg
2016-12-02Merge branch 'egil/compiler/opt-maps-pattern-matching/OTP-14072'Björn-Egil Dahlberg
* egil/compiler/opt-maps-pattern-matching/OTP-14072: compiler: Add regression tests compiler: Optimize maps pattern matching compiler: Allow for unaligned match argument in value groups
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:44:56 +0000