aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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
* hans/ssh/fix_app_appup: ssh: Fix syntax error in .appup
2014-12-09ssh: Fix syntax error in .appupHans Nilsson
2014-12-09Merge branch 'marcus/revert-ssh-testcase/OTP-12004' into maintMarcus Arendt
* marcus/revert-ssh-testcase/OTP-12004: revert ssh testcase
2014-12-09revert ssh testcaseMarcus Arendt
2014-12-09Merge branch 'dgud/debugger/still-invoked-gs-functions/OTP-12357' into maintDan Gudmundsson
* dgud/debugger/still-invoked-gs-functions/OTP-12357: debugger: Do not use the old removed gs functionality
2014-12-08Merge branch 'hans/ssh/fix_app_appup' into maintHans Nilsson
* hans/ssh/fix_app_appup: ssh: Fix .app and .appup
2014-12-08ssh: Fix .app and .appupHans Nilsson
2014-12-08Merge branch 'rickard/appup-files/OTP-12358' into maintRickard Green
* rickard/appup-files/OTP-12358: Add .appup file
2014-12-08Add .appup fileRickard Green
2014-12-08Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green
* rickard/autoconf/OTP-12348: Update megaco.appup.src
2014-12-08Update megaco.appup.srcRickard Green
2014-12-08debugger: Do not use the old removed gs functionalityDan Gudmundsson
dbg_ui_trace module was invoked even though the module had been removed.
2014-12-05Merge branch 'marcus/revert-ssh-fix/OTP-12004' into maintMarcus Arendt
* marcus/revert-ssh-fix/OTP-12004: Revert "ssh: Corrected ret val from ssh_connection:subsystem/4."
2014-12-05Revert "ssh: Corrected ret val from ssh_connection:subsystem/4."Marcus Arendt
This reverts commit d086394ebd3595d431835af80709977a6c1c7c89.
2014-12-03Merge branch 'rickard/check-io-warning-fix/OTP-12352' into maintRickard Green
* rickard/check-io-warning-fix/OTP-12352: Fix function "defined but not used" warning
2014-12-03Fix function "defined but not used" warningRickard Green
2014-12-03Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green
* rickard/autoconf/OTP-12348: Distribute autoconf helpers
2014-12-03erts: Fix some spelling in internal docsSverker Eriksson
2014-12-03Merge branch 'raimo/netns-opt-gen_udp/OTP-12314' into maintRaimo Niskanen
* raimo/netns-opt-gen_udp/OTP-12314: Text netns option at socket open Fix handling netns option in gen_udp
2014-12-03Merge branch 'ia/ssl/appup-fix' into maintIngela Anderton Andin
* ia/ssl/appup-fix: ssl: Correct appup
2014-12-03ssl: Correct appupIngela Anderton Andin
2014-12-02Distribute autoconf helpersRickard Green
Distribute aclocal.m4, install-sh, config.guess, and config.sub to applications at build time instead of having multiple identical copies committed in the repository.
2014-12-02Merge branch 'ia/ssh/prepare-for-release' into maintIngela Anderton Andin
* ia/ssh/prepare-for-release: ssh: Add soft upgrade for ptty_alloc
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
* egil/fix-dialyzer-map-key-coalescing/OTP-12347: dialyzer: Test recoalesced map keys compiler: Coalesce map keys in dialyzer mode
2014-12-02Merge branch 'anders/diameter/17.4_release/OTP-12343' into maintAnders Svensson
* anders/diameter/17.4_release/OTP-12343: vsn -> 1.8 Update appup for 17.4
2014-12-02Merge branch 'siri/ct_netconfc/subsystem-timeout/OTP-12334' into maintHenrik Nord
* siri/ct_netconfc/subsystem-timeout/OTP-12334: [ct_netconfc] Handle timeout failure in ssh
2014-12-02Merge branch 'siri/ct_telnet/unstable-tests/OTP-12329' into maintHenrik Nord
* siri/ct_telnet/unstable-tests/OTP-12329: [ct_telnet] Fix test case 'server_speaks' [ct_telnet] Improve debug printouts and logging [ct_telnet] Add timestamp to telnet_server debug printout [ct_telnet] Extend timeout in test from 1 to 2 sek [ct_telnet] Don't send extra newline after password
2014-12-02Merge branch 'hans/ssh/appup' into maintHans Nilsson
* hans/ssh/appup: ssh: Fixes wrong version in appup file
2014-12-02ssh: Fixes wrong version in appup fileHans Nilsson
2014-12-02Merge branch 'lukas/erts/isfinite-fix/OTP-12268' into maintLukas Larsson
* lukas/erts/isfinite-fix/OTP-12268: erts: Fix finite warning for clang
2014-12-02erts: Fix finite warning for clangLukas Larsson
clang aka llvm claims to be __GNUC__ and thus we have to explicitly check that it is not used.
2014-12-02Merge branch 'lukas/erts/bif_info_rebuild/OTP-12344' into maintLukas Larsson
* lukas/erts/bif_info_rebuild/OTP-12344: Sort keys before generating
2014-12-02Merge branch 'tuncer/doc-fixes' into maintMarcus Arendt
* tuncer/doc-fixes: dict(3): fix typo reported by Rabbe Fogelholm Fix minor eprof and fprof doc issues
2014-12-02Merge branch 'ia/inets/prep-for-release' into maintIngela Anderton Andin
* ia/inets/prep-for-release: inets: Prepare for release
2014-12-02Merge branch 'ia/ssl/dialyzer/OTP-12341' into maintIngela Anderton Andin
* ia/ssl/dialyzer/OTP-12341: ssl: Prepare for release ssl: Change code to reflect that state data may be secret
2014-12-02Text netns option at socket openRaimo Niskanen
2014-12-02Merge branch 'raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066' ↵Raimo Niskanen
into maint * raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066: [snmp/compiler] Refinement of type Opaque was not allowed MIB constructs such as "SYNTAX Opaque (SIZE(0..65535))" was previously not allowed, this has now been fixed. See the standard ALARM-MIB for eaxmple.
2014-12-01vsn -> 1.8Anders Svensson
2014-12-01Update appup for 17.4Anders Svensson
OTP-12196 remote request table leak OTP-12233 3xxx result code without E-bit OTP-12281 ignored connect_timer OTP-12308 filter ordering
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 'hans/ssh/appup' into maintHans Nilsson
* hans/ssh/appup: ssh: prepares appup file for release
2014-12-01ssh: prepares appup file for releaseHans Nilsson
2014-12-01dialyzer: Test recoalesced map keysBjörn-Egil Dahlberg
2014-12-01compiler: Coalesce map keys in dialyzer modeBjörn-Egil Dahlberg
This fixes a regression introduced in commit 805f9c89fc01220bc1bb0f27e1b68fd4eca688ba The problem occured with map keys compiled with dialyzer option turned on. In OTP 17, map keys needs to be literals.