aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-09Prepare releaseErlang/OTP
2014-12-09Merge branch 'maint'Marcus Arendt
2014-12-09Update preloaded modulesMarcus Arendt
2014-12-09Merge branch 'maint'Marcus Arendt
2014-12-09Update primary bootstrapMarcus Arendt
2014-12-09erts: Allow cpu_timestamp tracing for LinuxLukas Larsson
2014-12-09Merge branch 'maint'Hans Nilsson
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-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 'maint'Marcus Arendt
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 'maint'Dan Gudmundsson
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-08eldap: Clarifies documentation for start_tls and searchHans Nilsson
2014-12-08Merge branch 'maint'Hans Nilsson
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 'maint'Rickard Green
* maint: Add .appup file
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 'maint'Rickard Green
* maint: Update megaco.appup.src
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 'egil/ets/use-internal-stack/OTP-12356'Björn-Egil Dahlberg
* egil/ets/use-internal-stack/OTP-12356: erts: Use internal stack for ets db_has_variable
2014-12-05Merge branch 'maint'Marcus Arendt
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-04erts: Start compilation of beam_emu earlierLukas Larsson
2014-12-03Merge branch 'maint'Rickard Green
* maint: Fix function "defined but not used" warning
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 'maint'Rickard Green
* maint: Distribute autoconf helpers
2014-12-03Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green
* rickard/autoconf/OTP-12348: Distribute autoconf helpers
2014-12-03Merge branch 'maint'Sverker Eriksson
2014-12-03erts: Fix some spelling in internal docsSverker Eriksson
2014-12-03Merge branch 'maint'Raimo Niskanen
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 'maint'Ingela Anderton Andin
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-02erts: Add compile time assert ERTS_CT_ASSERTSverker Eriksson
and usage
2014-12-02Merge branch 'maint'Ingela Anderton Andin
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