summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated OTP versionOTP-18.2.2Erlang/OTP2016-01-082-1/+2
* Update release notesErlang/OTP2016-01-081-0/+18
* Merge branch 'hans/ssh/keyboard_interactive0/OTP-13255' into maint-18Erlang/OTP2016-01-084-5/+86
|\
| * ssh: update vsn.mk to 4.2.1Hans Nilsson2016-01-081-1/+1
| * ssh: handle secondary ssh_msg_userauth_info_request messageHans Nilsson2016-01-082-3/+5
| * ssh: testcase for abnormal keyboard-interactive authenticationHans Nilsson2016-01-081-1/+80
|/
* Updated OTP versionOTP-18.2.1Erlang/OTP2015-12-172-1/+2
* Update release notesErlang/OTP2015-12-171-0/+21
* Update version numbersErlang/OTP2015-12-171-1/+1
* Merge branch 'jj1bdx/jj1bdx-18.2-freebsd-hipe-fix-2' into maintErlang/OTP2015-12-171-3/+25
|\
| * hipe_x86_signal.c: add FreeBSD sigaction codeKenji Rikitake2015-12-171-3/+25
* | Merge branch 'egil/fix-windows-paths/OTP-13202' into maintErlang/OTP2015-12-175-11/+111
|\ \
| * | Revert "Fix erroneous splitting of emulator path"Björn-Egil Dahlberg2015-12-175-11/+111
| |/
* | Merge tag 'OTP-18.2' into maintHenrik Nord2015-12-1656-37/+1113
|\ \ | |/
| * Updated OTP versionOTP-18.2Erlang/OTP2015-12-152-1/+2
| * Update release notesErlang/OTP2015-12-1528-3/+1078
| * Update version numbersErlang/OTP2015-12-1523-23/+23
| * Merge branch 'ia/libressl' into maintErlang/OTP2015-12-152-11/+12
| |\
| * \ Merge branch 'siri/appups-18.2' into maintErlang/OTP2015-12-153-10/+10
| |\ \
| | * | Update appups in kernel, stdlib and sasl for OTP-18.2Siri Hansen2015-12-113-10/+10
* | | | Merge branch 'ia/libressl' into maintIngela Anderton Andin2015-12-152-11/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | ssl: Print openssl version stringIngela Anderton Andin2015-12-141-0/+1
| * | | ssl: Do not use environment variables in openSSL config fileIngela Anderton Andin2015-12-141-11/+11
* | | | ssl: Convert all test to use "ssl_test_lib:portable_open_port"Ingela Anderton Andin2015-12-151-62/+61
| |/ / |/| |
* | | Merge branch 'ia/inets/dialyzer-custom' into maintIngela Anderton Andin2015-12-153-2/+4
|\ \ \
| * | | inets: Include behaviour modules in install targetIngela Anderton Andin2015-12-152-1/+2
| * | | inets: Fix dialyzer warningIngela Anderton Andin2015-12-151-1/+2
* | | | Merge branch 'zandra/update-windows-docs' into maintZandra2015-12-141-552/+429
|\ \ \ \
| * | | | update the howto build and install on windows documentationZandra2015-12-141-552/+429
* | | | | Merge branch 'zandra/fix-snmp-appup' into maintZandra2015-12-141-1/+2
|\ \ \ \ \
| * | | | | correct the snmp app up fileZandra2015-12-111-1/+2
| | |_|_|/ | |/| | |
* | | | | Update preloaded modulesHenrik Nord2015-12-1410-0/+0
* | | | | Update primary bootstrapHenrik Nord2015-12-1444-0/+261
* | | | | Merge branch 'dgud/wx/fix-observer-display' into maintDan Gudmundsson2015-12-141-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | wx: Revert part of 617387025b698cDan Gudmundsson2015-12-121-2/+2
* | | | | Merge branch 'ia/pr/919/OTP-13189' into maintIngela Anderton Andin2015-12-142-1/+39
|\ \ \ \ \
| * | | | | ssl: fix hibernate_after with instant or near instant timeoutsAndrey Mayorov2015-12-112-1/+39
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sverk/setnode-rename-bug/OTP-13076' into maintSverker Eriksson2015-12-111-0/+4
|\ \ \ \ \
| * | | | | erts: Fix correct node name for DTRACESverker Eriksson2015-12-111-0/+4
* | | | | | Merge branch 'sverk/dist-ctrl-msg-overflow' into maintSverker Eriksson2015-12-111-3/+4
|\ \ \ \ \ \
| * | | | | | erts: Fix faulty cleanup when receiving broken dist msgSverker Eriksson2015-12-111-3/+4
* | | | | | | Merge branch 'siri/sasl/doc-editors/OTP-13000' into maintSiri Hansen2015-12-1115-1360/+1434
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | sasl: Editorial changesxsipewe2015-12-1015-1360/+1434
* | | | | | | Merge branch 'ia/ssl/ECC-tests' into maintIngela Anderton Andin2015-12-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | ssl: Fix typosIngela Anderton Andin2015-12-111-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'ia/ssl/windows-tests' into maintIngela Anderton Andin2015-12-113-121/+125
|\ \ \ \ \ \ \
| * | | | | | | ssl: Use test case time out insteadIngela Anderton Andin2015-12-091-3/+1
| * | | | | | | ssl: Use spawn_executableIngela Anderton Andin2015-12-093-118/+124
* | | | | | | | Merge branch 'ia/ssl/renegotiate-tests' into maintIngela Anderton Andin2015-12-111-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | ssl: Add renegotiation exceptionIngela Anderton Andin2015-12-091-1/+3
| |/ / / / / /