Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix documentation about character types in unicode mode | Anthony Ramine | 2015-02-20 | 1 | -8/+13 |
* | Prepare release | Erlang/OTP | 2014-12-09 | 56 | -32/+1065 |
* | Merge remote-tracking branch 'upstream/maint' into maint | Hans Nilsson | 2014-12-09 | 5 | -31/+6 |
|\ | |||||
| * | revert ssh testcase | Marcus Arendt | 2014-12-09 | 1 | -26/+1 |
| * | Merge branch 'dgud/debugger/still-invoked-gs-functions/OTP-12357' into maint | Dan Gudmundsson | 2014-12-09 | 4 | -5/+5 |
| |\ | |||||
| | * | debugger: Do not use the old removed gs functionality | Dan Gudmundsson | 2014-12-08 | 4 | -5/+5 |
* | | | ssh: Fix syntax error in .appup | Hans Nilsson | 2014-12-09 | 1 | -1/+0 |
|/ / | |||||
* | | ssh: Fix .app and .appup | Hans Nilsson | 2014-12-08 | 2 | -2/+3 |
* | | Merge branch 'rickard/appup-files/OTP-12358' into maint | Rickard Green | 2014-12-08 | 4 | -7/+61 |
|\ \ | |||||
| * | | Add .appup file | Rickard Green | 2014-12-08 | 4 | -7/+61 |
| |/ | |||||
* | | Merge branch 'rickard/autoconf/OTP-12348' into maint | Rickard Green | 2014-12-08 | 1 | -0/+5 |
|\ \ | |/ |/| | |||||
| * | Update megaco.appup.src | Rickard Green | 2014-12-08 | 1 | -0/+5 |
* | | Revert "ssh: Corrected ret val from ssh_connection:subsystem/4." | Marcus Arendt | 2014-12-05 | 1 | -9/+3 |
* | | Merge branch 'rickard/autoconf/OTP-12348' into maint | Rickard Green | 2014-12-03 | 16 | -23011/+0 |
|\ \ | |/ | |||||
| * | Distribute autoconf helpers | Rickard Green | 2014-12-02 | 16 | -23011/+0 |
* | | Merge branch 'raimo/netns-opt-gen_udp/OTP-12314' into maint | Raimo Niskanen | 2014-12-03 | 2 | -18/+44 |
|\ \ | |||||
| * | | Text netns option at socket open | Raimo Niskanen | 2014-12-02 | 1 | -3/+29 |
| * | | Fix handling netns option in gen_udp | Emil Holmström | 2014-11-20 | 1 | -15/+15 |
* | | | ssl: Correct appup | Ingela Anderton Andin | 2014-12-03 | 1 | -2/+2 |
| |/ |/| | |||||
* | | ssh: Add soft upgrade for ptty_alloc | Ingela Anderton Andin | 2014-12-02 | 1 | -2/+4 |
* | | Merge branch 'egil/fix-dialyzer-map-key-coalescing/OTP-12347' into maint | Björn-Egil Dahlberg | 2014-12-02 | 2 | -16/+77 |
|\ \ | |||||
| * | | dialyzer: Test recoalesced map keys | Björn-Egil Dahlberg | 2014-12-01 | 1 | -0/+36 |
| * | | compiler: Coalesce map keys in dialyzer mode | Björn-Egil Dahlberg | 2014-12-01 | 1 | -16/+41 |
* | | | Merge branch 'anders/diameter/17.4_release/OTP-12343' into maint | Anders Svensson | 2014-12-02 | 2 | -3/+11 |
|\ \ \ | |||||
| * | | | vsn -> 1.8 | Anders Svensson | 2014-12-01 | 1 | -1/+1 |
| * | | | Update appup for 17.4 | Anders Svensson | 2014-12-01 | 1 | -2/+10 |
* | | | | Merge branch 'siri/ct_netconfc/subsystem-timeout/OTP-12334' into maint | Henrik Nord | 2014-12-02 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | [ct_netconfc] Handle timeout failure in ssh | Siri Hansen | 2014-11-27 | 1 | -1/+3 |
* | | | | | Merge branch 'siri/ct_telnet/unstable-tests/OTP-12329' into maint | Henrik Nord | 2014-12-02 | 4 | -32/+72 |
|\ \ \ \ \ | |||||
| * | | | | | [ct_telnet] Fix test case 'server_speaks' | Siri Hansen | 2014-11-27 | 1 | -7/+21 |
| * | | | | | [ct_telnet] Improve debug printouts and logging | Siri Hansen | 2014-11-27 | 1 | -15/+29 |
| * | | | | | [ct_telnet] Add timestamp to telnet_server debug printout | Siri Hansen | 2014-11-27 | 1 | -1/+11 |
| * | | | | | [ct_telnet] Extend timeout in test from 1 to 2 sek | Siri Hansen | 2014-11-27 | 1 | -7/+9 |
| * | | | | | [ct_telnet] Don't send extra newline after password | Siri Hansen | 2014-11-27 | 1 | -2/+2 |
* | | | | | | Merge branch 'hans/ssh/appup' into maint | Hans Nilsson | 2014-12-02 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ssh: Fixes wrong version in appup file | Hans Nilsson | 2014-12-02 | 1 | -2/+2 |
* | | | | | | | Merge branch 'tuncer/doc-fixes' into maint | Marcus Arendt | 2014-12-02 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | dict(3): fix typo reported by Rabbe Fogelholm | Tuncer Ayaz | 2014-11-30 | 1 | -1/+1 |
| * | | | | | | | Fix minor eprof and fprof doc issues | Tuncer Ayaz | 2014-11-29 | 2 | -2/+2 |
* | | | | | | | | Merge branch 'ia/inets/prep-for-release' into maint | Ingela Anderton Andin | 2014-12-02 | 2 | -36/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | inets: Prepare for release | Ingela Anderton Andin | 2014-12-01 | 2 | -36/+1 |
* | | | | | | | | | Merge branch 'ia/ssl/dialyzer/OTP-12341' into maint | Ingela Anderton Andin | 2014-12-02 | 5 | -51/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ssl: Prepare for release | Ingela Anderton Andin | 2014-12-01 | 2 | -13/+1 |
| * | | | | | | | | | ssl: Change code to reflect that state data may be secret | Ingela Anderton Andin | 2014-12-01 | 3 | -38/+41 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066' in... | Raimo Niskanen | 2014-12-02 | 4 | -1/+71 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | [snmp/compiler] Refinement of type Opaque was not allowed | Micael Karlberg | 2014-12-01 | 4 | -1/+71 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'hans/ssh/appup' into maint | Hans Nilsson | 2014-12-01 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | ssh: prepares appup file for release | Hans Nilsson | 2014-12-01 | 1 | -0/+10 |
* | | | | | | | | Merge branch 'anders/diameter/filters/OTP-12308' into maint | Anders Svensson | 2014-12-01 | 2 | -29/+48 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Order peers in pick_peer callbacks | Anders Svensson | 2014-11-27 | 2 | -29/+48 |