aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Expand)Author
2014-12-09Merge remote-tracking branch 'upstream/master'Hans Nilsson
2014-12-09Merge branch 'maint'Hans Nilsson
2014-12-09ssh: Fix syntax error in .appupHans Nilsson
2014-12-09Merge branch 'maint'Marcus Arendt
2014-12-09revert ssh testcaseMarcus Arendt
2014-12-09Merge branch 'maint'Dan Gudmundsson
2014-12-09Merge branch 'dgud/debugger/still-invoked-gs-functions/OTP-12357' into maintDan Gudmundsson
2014-12-08Merge branch 'maint'Hans Nilsson
2014-12-08ssh: Fix .app and .appupHans Nilsson
2014-12-08Merge branch 'maint'Rickard Green
2014-12-08Merge branch 'rickard/appup-files/OTP-12358' into maintRickard Green
2014-12-08Add .appup fileRickard Green
2014-12-08Merge branch 'maint'Rickard Green
2014-12-08Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green
2014-12-08Update megaco.appup.srcRickard Green
2014-12-08debugger: Do not use the old removed gs functionalityDan Gudmundsson
2014-12-05Merge branch 'maint'Marcus Arendt
2014-12-05Revert "ssh: Corrected ret val from ssh_connection:subsystem/4."Marcus Arendt
2014-12-03Merge branch 'maint'Rickard Green
2014-12-03Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green
2014-12-03Merge branch 'maint'Raimo Niskanen
2014-12-03Merge branch 'raimo/netns-opt-gen_udp/OTP-12314' into maintRaimo Niskanen
2014-12-03Merge branch 'maint'Ingela Anderton Andin
2014-12-03ssl: Correct appupIngela Anderton Andin
2014-12-02Distribute autoconf helpersRickard Green
2014-12-02Merge branch 'maint'Ingela Anderton Andin
2014-12-02ssh: Add soft upgrade for ptty_allocIngela Anderton Andin
2014-12-02Merge branch 'egil/fix-dialyzer-map-key-coalescing/OTP-12347' into maintBjörn-Egil Dahlberg
2014-12-02Merge branch 'maint'Anders Svensson
2014-12-02Merge branch 'anders/diameter/17.4_release/OTP-12343' into maintAnders Svensson
2014-12-02Merge branch 'maint'Henrik Nord
2014-12-02Merge branch 'siri/ct_netconfc/subsystem-timeout/OTP-12334' into maintHenrik Nord
2014-12-02Merge branch 'siri/ct_telnet/unstable-tests/OTP-12329' into maintHenrik Nord
2014-12-02Merge branch 'maint'Hans Nilsson
2014-12-02Merge branch 'hans/ssh/appup' into maintHans Nilsson
2014-12-02ssh: Fixes wrong version in appup fileHans Nilsson
2014-12-02Merge branch 'maint'Marcus Arendt
2014-12-02Merge branch 'tuncer/doc-fixes' into maintMarcus Arendt
2014-12-02Merge branch 'maint'Ingela Anderton Andin
2014-12-02Merge branch 'ia/inets/prep-for-release' into maintIngela Anderton Andin
2014-12-02Merge branch 'ia/ssl/dialyzer/OTP-12341' into maintIngela Anderton Andin
2014-12-02Text netns option at socket openRaimo Niskanen
2014-12-02Merge branch 'maint'Raimo Niskanen
2014-12-02Merge branch 'raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066' in...Raimo Niskanen
2014-12-01vsn -> 1.8Anders Svensson
2014-12-01Update appup for 17.4Anders Svensson
2014-12-01ssl: Prepare for releaseIngela Anderton Andin
2014-12-01ssl: Change code to reflect that state data may be secretIngela Anderton Andin
2014-12-01inets: Prepare for releaseIngela Anderton Andin
2014-12-01Merge branch 'maint'Hans Nilsson