Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Break erts_debug:lock_counters/1 into separate BIFs | John Högberg | 2017-07-06 | 4 | -31/+85 |
* | Enable lcnt smoke test on all builds that have lcnt enabled | John Högberg | 2017-07-06 | 1 | -3/+2 |
* | Make lock counter info independent of the locks being counted | John Högberg | 2017-05-18 | 1 | -8/+0 |
* | Merge pull request #1466 from bjorng/bjorn/stdlib/safer-get_stacktrace | Björn Gustavsson | 2017-05-18 | 2 | -14/+16 |
|\ | |||||
| * | proc_lib: Don't call erlang:get_stacktrace/0 twice | Björn Gustavsson | 2017-05-17 | 1 | -13/+14 |
| * | escript: Pick up stacktrace a soon as possible | Björn Gustavsson | 2017-05-17 | 1 | -1/+2 |
* | | Merge pull request #1446 from hairyhum/crypto-duplicate-aes_gcm | Hans Nilsson | 2017-05-18 | 1 | -3/+0 |
|\ \ | |||||
| * | | Remove duplicate aes_gcm from a list of ciphers | Daniil Fedotov | 2017-05-09 | 1 | -3/+0 |
* | | | Merge branch 'ferd/kernel/shell-history-storage/OTP-14409' | Dan Gudmundsson | 2017-05-17 | 10 | -11/+418 |
|\ \ \ | |||||
| * | | | Add persistence to history of the non-legacy shell | Fred Hebert | 2017-05-17 | 5 | -1/+368 |
| * | | | add option 'quiet' to disk_log | Fred Hebert | 2017-05-17 | 5 | -9/+49 |
| * | | | Fix type declaration for disk_log.hrl | Fred Hebert | 2017-05-17 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'hans/ssh/cuddle_tests' | Hans Nilsson | 2017-05-17 | 4 | -44/+40 |
|\ \ \ | |||||
| * | | | ssh: update testcase in ssh_to_openssh | Hans Nilsson | 2017-05-17 | 1 | -43/+25 |
| * | | | ssh: test case didn't set preferred_algorithms | Hans Nilsson | 2017-05-17 | 1 | -1/+2 |
| * | | | ssh: update property test for sign-algorithm | Hans Nilsson | 2017-05-17 | 1 | -0/+10 |
| * | | | ssh: fix end_per_suite in property testcase | Hans Nilsson | 2017-05-17 | 1 | -0/+3 |
* | | | | Merge branch 'hans/ssh/ext-info_bug_fixes' | Hans Nilsson | 2017-05-17 | 5 | -31/+57 |
|\ \ \ \ | |||||
| * | | | | ssh: disable rsa-sha2-* for clients | Hans Nilsson | 2017-05-17 | 1 | -7/+22 |
| * | | | | ssh: select server-sig-algs from configured algos (preferred_algorithms) | Hans Nilsson | 2017-05-17 | 2 | -3/+5 |
| * | | | | ssh: Use 'server-sig-algs' for client's selection of algs | Hans Nilsson | 2017-05-17 | 1 | -7/+10 |
| * | | | | ssh: fix broken preferred_algorithms and pref_public_key_algs options | Hans Nilsson | 2017-05-17 | 2 | -15/+21 |
| |/ / / | |||||
* | | | | ssh: make ssh_algorithms_SUITE test public user and host keys | Hans Nilsson | 2017-05-17 | 2 | -55/+114 |
* | | | | ssh: Enable rsa-sha2-* | Hans Nilsson | 2017-05-17 | 1 | -6/+2 |
|/ / / | |||||
* | | | Merge branch 'dgud/observer/chunk-proc-info' | Dan Gudmundsson | 2017-05-17 | 4 | -58/+166 |
|\ \ \ | |||||
| * | | | observer: Fix alpabetic ordering when sorting on Name | Dan Gudmundsson | 2017-05-10 | 1 | -6/+48 |
| * | | | observer: Handle crash when node goes down | Dan Gudmundsson | 2017-05-09 | 1 | -8/+11 |
| * | | | observer: listen on correct notebook change | Dan Gudmundsson | 2017-05-09 | 1 | -2/+4 |
| * | | | observer: chunk process list info | Dan Gudmundsson | 2017-05-09 | 2 | -46/+107 |
* | | | | Merge branch 'dgud/wx/fix-msvc-2015' | Dan Gudmundsson | 2017-05-17 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | wx: Fix builds on VS-2017 | Dan Gudmundsson | 2017-05-11 | 1 | -1/+1 |
* | | | | Merge pull request #1465 from bjorng/bjorn/tools/fix-lcnt-doc | Björn Gustavsson | 2017-05-17 | 2 | -7/+7 |
|\ \ \ \ | |||||
| * | | | | Fix a few minor issues in the lcnt documentation | Björn Gustavsson | 2017-05-17 | 2 | -7/+7 |
* | | | | | Merge pull request #1463 from bjorng/bjorn/simplify-building-lcnt/OTP-14407 | Björn Gustavsson | 2017-05-17 | 2 | -20/+91 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | lcnt_SUITE: Add a smoke test for running lock-counting | Björn Gustavsson | 2017-05-16 | 1 | -2/+83 |
| * | | | | Update instructions for how to start the lock-counting VM | Björn Gustavsson | 2017-05-16 | 1 | -18/+8 |
* | | | | | Merge branch 'ingela/dtls/opts' | Ingela Anderton Andin | 2017-05-16 | 4 | -44/+59 |
|\ \ \ \ \ | |||||
| * | | | | | ssl: Adopt setopts and getopts for DTLS | Ingela Anderton Andin | 2017-05-16 | 4 | -44/+59 |
* | | | | | | Merge pull request #1452 from niku/patch-1 | Ingela Andin | 2017-05-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix minor typo and notation in httpc:request/[4,5] | niku | 2017-05-15 | 1 | -1/+1 |
* | | | | | | | Merge branch 'ingela/remove-debug' | Ingela Anderton Andin | 2017-05-16 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ssl: Remove debug printout | Ingela Anderton Andin | 2017-05-16 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'hans/ssh/ssh_file_user_key_checks_ec_size/OTP-14410' | Hans Nilsson | 2017-05-16 | 1 | -5/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ssh: ssh_file:user_key/2 checks ec keytype | Hans Nilsson | 2017-05-15 | 1 | -5/+12 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'hans/ssh/test_ext_info_extension/OTP-14361' | Hans Nilsson | 2017-05-16 | 2 | -7/+133 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ssh: Tests for ext-info extension (ext-info-c) | Hans Nilsson | 2017-05-12 | 2 | -4/+76 |
| * | | | | | | | | ssh: Tests for ext-info extension (ext-info-s) | Hans Nilsson | 2017-05-12 | 1 | -5/+59 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'hans/ssh/enable_auth_methods_for_clients/OTP-14399' | Hans Nilsson | 2017-05-16 | 4 | -16/+31 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | ssh: Better error checking for option 'auth_methods' | Hans Nilsson | 2017-05-12 | 2 | -6/+12 |
| * | | | | | | | ssh: Doc option 'auth_methods' for client | Hans Nilsson | 2017-05-12 | 2 | -1/+14 |