summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Break erts_debug:lock_counters/1 into separate BIFsJohn Högberg2017-07-064-31/+85
* Enable lcnt smoke test on all builds that have lcnt enabledJohn Högberg2017-07-061-3/+2
* Make lock counter info independent of the locks being countedJohn Högberg2017-05-181-8/+0
* Merge pull request #1466 from bjorng/bjorn/stdlib/safer-get_stacktraceBjörn Gustavsson2017-05-182-14/+16
|\
| * proc_lib: Don't call erlang:get_stacktrace/0 twiceBjörn Gustavsson2017-05-171-13/+14
| * escript: Pick up stacktrace a soon as possibleBjörn Gustavsson2017-05-171-1/+2
* | Merge pull request #1446 from hairyhum/crypto-duplicate-aes_gcmHans Nilsson2017-05-181-3/+0
|\ \
| * | Remove duplicate aes_gcm from a list of ciphersDaniil Fedotov2017-05-091-3/+0
* | | Merge branch 'ferd/kernel/shell-history-storage/OTP-14409'Dan Gudmundsson2017-05-1710-11/+418
|\ \ \
| * | | Add persistence to history of the non-legacy shellFred Hebert2017-05-175-1/+368
| * | | add option 'quiet' to disk_logFred Hebert2017-05-175-9/+49
| * | | Fix type declaration for disk_log.hrlFred Hebert2017-05-171-1/+1
| | |/ | |/|
* | | Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson2017-05-174-44/+40
|\ \ \
| * | | ssh: update testcase in ssh_to_opensshHans Nilsson2017-05-171-43/+25
| * | | ssh: test case didn't set preferred_algorithmsHans Nilsson2017-05-171-1/+2
| * | | ssh: update property test for sign-algorithmHans Nilsson2017-05-171-0/+10
| * | | ssh: fix end_per_suite in property testcaseHans Nilsson2017-05-171-0/+3
* | | | Merge branch 'hans/ssh/ext-info_bug_fixes'Hans Nilsson2017-05-175-31/+57
|\ \ \ \
| * | | | ssh: disable rsa-sha2-* for clientsHans Nilsson2017-05-171-7/+22
| * | | | ssh: select server-sig-algs from configured algos (preferred_algorithms)Hans Nilsson2017-05-172-3/+5
| * | | | ssh: Use 'server-sig-algs' for client's selection of algsHans Nilsson2017-05-171-7/+10
| * | | | ssh: fix broken preferred_algorithms and pref_public_key_algs optionsHans Nilsson2017-05-172-15/+21
| |/ / /
* | | | ssh: make ssh_algorithms_SUITE test public user and host keysHans Nilsson2017-05-172-55/+114
* | | | ssh: Enable rsa-sha2-*Hans Nilsson2017-05-171-6/+2
|/ / /
* | | Merge branch 'dgud/observer/chunk-proc-info'Dan Gudmundsson2017-05-174-58/+166
|\ \ \
| * | | observer: Fix alpabetic ordering when sorting on NameDan Gudmundsson2017-05-101-6/+48
| * | | observer: Handle crash when node goes downDan Gudmundsson2017-05-091-8/+11
| * | | observer: listen on correct notebook changeDan Gudmundsson2017-05-091-2/+4
| * | | observer: chunk process list infoDan Gudmundsson2017-05-092-46/+107
* | | | Merge branch 'dgud/wx/fix-msvc-2015'Dan Gudmundsson2017-05-171-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | wx: Fix builds on VS-2017Dan Gudmundsson2017-05-111-1/+1
* | | | Merge pull request #1465 from bjorng/bjorn/tools/fix-lcnt-docBjörn Gustavsson2017-05-172-7/+7
|\ \ \ \
| * | | | Fix a few minor issues in the lcnt documentationBjörn Gustavsson2017-05-172-7/+7
* | | | | Merge pull request #1463 from bjorng/bjorn/simplify-building-lcnt/OTP-14407Björn Gustavsson2017-05-172-20/+91
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | lcnt_SUITE: Add a smoke test for running lock-countingBjörn Gustavsson2017-05-161-2/+83
| * | | | Update instructions for how to start the lock-counting VMBjörn Gustavsson2017-05-161-18/+8
* | | | | Merge branch 'ingela/dtls/opts'Ingela Anderton Andin2017-05-164-44/+59
|\ \ \ \ \
| * | | | | ssl: Adopt setopts and getopts for DTLSIngela Anderton Andin2017-05-164-44/+59
* | | | | | Merge pull request #1452 from niku/patch-1Ingela Andin2017-05-161-1/+1
|\ \ \ \ \ \
| * | | | | | Fix minor typo and notation in httpc:request/[4,5]niku2017-05-151-1/+1
* | | | | | | Merge branch 'ingela/remove-debug'Ingela Anderton Andin2017-05-161-1/+0
|\ \ \ \ \ \ \
| * | | | | | | ssl: Remove debug printoutIngela Anderton Andin2017-05-161-1/+0
* | | | | | | | Merge branch 'hans/ssh/ssh_file_user_key_checks_ec_size/OTP-14410'Hans Nilsson2017-05-161-5/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | ssh: ssh_file:user_key/2 checks ec keytypeHans Nilsson2017-05-151-5/+12
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'hans/ssh/test_ext_info_extension/OTP-14361'Hans Nilsson2017-05-162-7/+133
|\ \ \ \ \ \ \ \
| * | | | | | | | ssh: Tests for ext-info extension (ext-info-c)Hans Nilsson2017-05-122-4/+76
| * | | | | | | | ssh: Tests for ext-info extension (ext-info-s)Hans Nilsson2017-05-121-5/+59
| |/ / / / / / /
* | | | | | | | Merge branch 'hans/ssh/enable_auth_methods_for_clients/OTP-14399'Hans Nilsson2017-05-164-16/+31
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | ssh: Better error checking for option 'auth_methods'Hans Nilsson2017-05-122-6/+12
| * | | | | | | ssh: Doc option 'auth_methods' for clientHans Nilsson2017-05-122-1/+14