aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Expand)Author
2014-12-19eldap: fix merge conflictHans Nilsson
2014-12-19Merge branch 'hans/eldap/test_improvents/OTP-12355' into maintHans Nilsson
2014-12-18Merge branch 'maint'Bruce Yinhe
2014-12-18Merge branch 'haguenau/fix-endianness-speling' into maintBruce Yinhe
2014-12-17eldap: Corrects SSL over IPv6 test.Hans Nilsson
2014-12-17eldap: Removes eldap_misc_SUITE that is now included in eldap_basic_SUITE.Hans Nilsson
2014-12-17eldap: Add encode/decode tests.Hans Nilsson
2014-12-17eldap: Merge eldap_connections_SUITE into eldab_basic_SUITEHans Nilsson
2014-12-17 eldap: Adds ssl to connections test suiteHans Nilsson
2014-12-17eldap: Updates basic test suiteHans Nilsson
2014-12-17Merge branch 'maint'Ingela Anderton Andin
2014-12-17ssh: Improve errorhandling in ssh_connection.erlIngela Anderton Andin
2014-12-17Merge branch 'maint'Marcus Arendt
2014-12-17Merge branch 'marcus/revert-ssh-testcase2/OTP-12004' into maintMarcus Arendt
2014-12-16Merge branch 'sverk/ets-take-2/OTP-12309'Sverker Eriksson
2014-12-12Merge branch 'maint'Hans Nilsson
2014-12-12Merge branch 'hans/eldap/doc_fixes/OTP-12354' into maintHans Nilsson
2014-12-12Merge branch 'maint'Marcus Arendt
2014-12-12add missing release notesMarcus Arendt
2014-12-10Merge branch 'ia/scrapinghub/closing_httpc_handler_on_closed_while_send'Ingela Anderton Andin
2014-12-10Merge tag 'OTP-17.4'Marcus Arendt
2014-12-10fix failed conflict resolutionMarcus Arendt
2014-12-09Prepare releaseErlang/OTP
2014-12-09Merge remote-tracking branch 'upstream/master'Hans Nilsson
2014-12-09Merge remote-tracking branch 'upstream/maint' into maintHans 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-08eldap: Clarifies documentation for start_tls and searchHans Nilsson
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