summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix documentation about character types in unicode modeAnthony Ramine2015-02-201-8/+13
* Prepare releaseErlang/OTP2014-12-0956-32/+1065
* Merge remote-tracking branch 'upstream/maint' into maintHans Nilsson2014-12-095-31/+6
|\
| * revert ssh testcaseMarcus Arendt2014-12-091-26/+1
| * Merge branch 'dgud/debugger/still-invoked-gs-functions/OTP-12357' into maintDan Gudmundsson2014-12-094-5/+5
| |\
| | * debugger: Do not use the old removed gs functionalityDan Gudmundsson2014-12-084-5/+5
* | | ssh: Fix syntax error in .appupHans Nilsson2014-12-091-1/+0
|/ /
* | ssh: Fix .app and .appupHans Nilsson2014-12-082-2/+3
* | Merge branch 'rickard/appup-files/OTP-12358' into maintRickard Green2014-12-084-7/+61
|\ \
| * | Add .appup fileRickard Green2014-12-084-7/+61
| |/
* | Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green2014-12-081-0/+5
|\ \ | |/ |/|
| * Update megaco.appup.srcRickard Green2014-12-081-0/+5
* | Revert "ssh: Corrected ret val from ssh_connection:subsystem/4."Marcus Arendt2014-12-051-9/+3
* | Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green2014-12-0316-23011/+0
|\ \ | |/
| * Distribute autoconf helpersRickard Green2014-12-0216-23011/+0
* | Merge branch 'raimo/netns-opt-gen_udp/OTP-12314' into maintRaimo Niskanen2014-12-032-18/+44
|\ \
| * | Text netns option at socket openRaimo Niskanen2014-12-021-3/+29
| * | Fix handling netns option in gen_udpEmil Holmström2014-11-201-15/+15
* | | ssl: Correct appupIngela Anderton Andin2014-12-031-2/+2
| |/ |/|
* | ssh: Add soft upgrade for ptty_allocIngela Anderton Andin2014-12-021-2/+4
* | Merge branch 'egil/fix-dialyzer-map-key-coalescing/OTP-12347' into maintBjörn-Egil Dahlberg2014-12-022-16/+77
|\ \
| * | dialyzer: Test recoalesced map keysBjörn-Egil Dahlberg2014-12-011-0/+36
| * | compiler: Coalesce map keys in dialyzer modeBjörn-Egil Dahlberg2014-12-011-16/+41
* | | Merge branch 'anders/diameter/17.4_release/OTP-12343' into maintAnders Svensson2014-12-022-3/+11
|\ \ \
| * | | vsn -> 1.8Anders Svensson2014-12-011-1/+1
| * | | Update appup for 17.4Anders Svensson2014-12-011-2/+10
* | | | Merge branch 'siri/ct_netconfc/subsystem-timeout/OTP-12334' into maintHenrik Nord2014-12-021-1/+3
|\ \ \ \
| * | | | [ct_netconfc] Handle timeout failure in sshSiri Hansen2014-11-271-1/+3
* | | | | Merge branch 'siri/ct_telnet/unstable-tests/OTP-12329' into maintHenrik Nord2014-12-024-32/+72
|\ \ \ \ \
| * | | | | [ct_telnet] Fix test case 'server_speaks'Siri Hansen2014-11-271-7/+21
| * | | | | [ct_telnet] Improve debug printouts and loggingSiri Hansen2014-11-271-15/+29
| * | | | | [ct_telnet] Add timestamp to telnet_server debug printoutSiri Hansen2014-11-271-1/+11
| * | | | | [ct_telnet] Extend timeout in test from 1 to 2 sekSiri Hansen2014-11-271-7/+9
| * | | | | [ct_telnet] Don't send extra newline after passwordSiri Hansen2014-11-271-2/+2
* | | | | | Merge branch 'hans/ssh/appup' into maintHans Nilsson2014-12-021-2/+2
|\ \ \ \ \ \
| * | | | | | ssh: Fixes wrong version in appup fileHans Nilsson2014-12-021-2/+2
* | | | | | | Merge branch 'tuncer/doc-fixes' into maintMarcus Arendt2014-12-023-3/+3
|\ \ \ \ \ \ \
| * | | | | | | dict(3): fix typo reported by Rabbe FogelholmTuncer Ayaz2014-11-301-1/+1
| * | | | | | | Fix minor eprof and fprof doc issuesTuncer Ayaz2014-11-292-2/+2
* | | | | | | | Merge branch 'ia/inets/prep-for-release' into maintIngela Anderton Andin2014-12-022-36/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | inets: Prepare for releaseIngela Anderton Andin2014-12-012-36/+1
* | | | | | | | | Merge branch 'ia/ssl/dialyzer/OTP-12341' into maintIngela Anderton Andin2014-12-025-51/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ssl: Prepare for releaseIngela Anderton Andin2014-12-012-13/+1
| * | | | | | | | | ssl: Change code to reflect that state data may be secretIngela Anderton Andin2014-12-013-38/+41
| |/ / / / / / / /
* | | | | | | | | Merge branch 'raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066' in...Raimo Niskanen2014-12-024-1/+71
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [snmp/compiler] Refinement of type Opaque was not allowedMicael Karlberg2014-12-014-1/+71
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'hans/ssh/appup' into maintHans Nilsson2014-12-011-0/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | ssh: prepares appup file for releaseHans Nilsson2014-12-011-0/+10
* | | | | | | | Merge branch 'anders/diameter/filters/OTP-12308' into maintAnders Svensson2014-12-012-29/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Order peers in pick_peer callbacksAnders Svensson2014-11-272-29/+48