aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2014-12-17Merge branch 'ia/ssh/ssh-connection-protocol-timeout/OTP-12004' into maintIngela Anderton Andin
2014-12-17ssh: Improve errorhandling in ssh_connection.erlIngela Anderton Andin
2014-12-17Merge branch 'marcus/revert-ssh-testcase2/OTP-12004' into maintMarcus Arendt
2014-12-12Merge branch 'hans/eldap/doc_fixes/OTP-12354' into maintHans Nilsson
2014-12-12Merge branch 'marcus/fix-eldap-notes' into maintMarcus Arendt
2014-12-12add missing release notesMarcus Arendt
2014-12-11Fix compile breakage on OpenBSDAlex Wilson
2014-12-10Merge branch 'rickard/atomic64/OTP-12351' into maintRickard Green
2014-12-10Use the new 64-bit atomic ops APIRickard Green
2014-12-10Introduce a 64-bit atomic ops APIRickard Green
2014-12-10fix failed conflict resolutionMarcus Arendt
2014-12-09Updated OTP versionOTP-17.4Erlang/OTP
2014-12-09Prepare releaseErlang/OTP
2014-12-09Update preloaded modulesMarcus Arendt
2014-12-09Update primary bootstrapMarcus Arendt
2014-12-09Merge remote-tracking branch 'upstream/maint' into maintHans Nilsson
2014-12-09Merge branch 'hans/ssh/fix_app_appup' into maintHans Nilsson
2014-12-09ssh: Fix syntax error in .appupHans Nilsson
2014-12-09Merge branch 'marcus/revert-ssh-testcase/OTP-12004' into maintMarcus Arendt
2014-12-09revert ssh testcaseMarcus Arendt
2014-12-09Merge branch 'dgud/debugger/still-invoked-gs-functions/OTP-12357' into maintDan Gudmundsson
2014-12-08Fix inet:getopts involving #sctp_paddrinfo{}Simon Cornish
2014-12-08eldap: Clarifies documentation for start_tls and searchHans Nilsson
2014-12-08Merge branch 'hans/ssh/fix_app_appup' into maintHans Nilsson
2014-12-08ssh: Fix .app and .appupHans Nilsson
2014-12-08Merge branch 'rickard/appup-files/OTP-12358' into maintRickard Green
2014-12-08Add .appup fileRickard 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 'marcus/revert-ssh-fix/OTP-12004' into maintMarcus Arendt
2014-12-05Revert "ssh: Corrected ret val from ssh_connection:subsystem/4."Marcus Arendt
2014-12-03Merge branch 'rickard/check-io-warning-fix/OTP-12352' into maintRickard Green
2014-12-03Fix function "defined but not used" warningRickard Green
2014-12-03Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green
2014-12-03erts: Fix some spelling in internal docsSverker Eriksson
2014-12-03Merge branch 'raimo/netns-opt-gen_udp/OTP-12314' into maintRaimo Niskanen
2014-12-03Merge branch 'ia/ssl/appup-fix' into maintIngela Anderton Andin
2014-12-03ssl: Correct appupIngela Anderton Andin
2014-12-02Distribute autoconf helpersRickard Green
2014-12-02fix eacces spellingMikael Pettersson
2014-12-02Merge branch 'ia/ssh/prepare-for-release' into maintIngela Anderton Andin
2014-12-02ssh: Add soft upgrade for ptty_allocIngela Anderton Andin
2014-12-02Replaced "Endianess" with "Endianness" everywhereDavid Haguenauer
2014-12-02Merge branch 'egil/fix-dialyzer-map-key-coalescing/OTP-12347' into maintBjörn-Egil Dahlberg
2014-12-02Merge branch 'anders/diameter/17.4_release/OTP-12343' into maintAnders Svensson
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 'hans/ssh/appup' into maintHans Nilsson
2014-12-02ssh: Fixes wrong version in appup fileHans Nilsson