aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-12-05Merge branch 'emj/report-tunnel-errors/PR-1254' into maintIngela Anderton Andin
* emj/report-tunnel-errors/PR-1254: Report errors from TLS tunnel request to correct process
2016-12-05Merge branch 'ingela/ECC-tests' into maintIngela Anderton Andin
* ingela/ECC-tests: ssl: Make sure common-test priv_dir is used for test case generated files
2016-12-05Merge branch 'siri/cdv/abort-tag/OTP-14053' into maintSiri Hansen
* siri/cdv/abort-tag/OTP-14053: [crashdump_viewer] Display abort reason when truncated
2016-12-05Merge branch 'hans/public_key/prepare_release' into maintHans Nilsson
2016-12-05Merge branch 'hans/ssh/prepare_release' into maintHans Nilsson
2016-12-05Merge branch 'hans/eldap/prepare_release' into maintHans Nilsson
2016-12-05public_key: update vsn.mkHans Nilsson
2016-12-05ssh: update vsn.mkHans Nilsson
2016-12-05eldap: update vsn.mkHans Nilsson
2016-12-05Merge branch 'lars/megaco/cuddle-tests/OTP-14075' into maintLars Thorsen
* lars/megaco/cuddle-tests/OTP-14075: [megaco} Update version [megaco] Use the test_server app and appup tests
2016-12-05Merge branch 'hans/public_key/cover_spec' into maintHans Nilsson
2016-12-05Merge branch 'hans/ssh/cover_spec' into maintHans Nilsson
2016-12-05[megaco} Update versionLars Thorsen
2016-12-05[megaco] Use the test_server app and appup testsLars Thorsen
2016-12-05Merge branch 'siri/cdv/faulty-column-vals/OTP-14064' into maintSiri Hansen
* siri/cdv/faulty-column-vals/OTP-14064: [crashdump_viewer] Show correct values for 'Object' and 'Memory'
2016-12-05Merge branch 'richcarl/mnesia/table_info_order' into maintDan Gudmundsson
* richcarl/mnesia/table_info_order: Preserve key order in mnesia:table_info
2016-12-05Merge branch 'dgud/mnesia/off-heap-msgs/OTP-14074' into maintDan Gudmundsson
* dgud/mnesia/off-heap-msgs/OTP-14074: Use off_heap memory queue for mnesia_tm
2016-12-02ssh: excluded modules from cover specHans Nilsson
2016-12-02public_key: exclude asn1 generated module PKCS-FRAME from coverHans Nilsson
2016-12-02Merge branch 'peppe/common_test/surviving_gl_procs/ERL-287/OTP-14026' into maintPeter Andersson
* peppe/common_test/surviving_gl_procs/ERL-287/OTP-14026: Make sure group leader processes terminate properly OTP-14026
2016-12-02Make sure group leader processes terminate properlyPeter Andersson
OTP-14026
2016-12-02Merge branch 'peppe/common_test/log_header/OTP-14043' into maintPeter Andersson
* peppe/common_test/log_header/OTP-14043: Add heading option to log functions OTP-14043
2016-12-02Add heading option to log functionsPeter Andersson
2016-12-02Merge branch 'peppe/common_test/logging_verbosity/OTP-14044' into maintPeter Andersson
* peppe/common_test/logging_verbosity/OTP-14044: Correct errors in documentation and add more info OTP-14044
2016-12-02Correct errors in documentation and add more infoPeter Andersson
OTP-14044
2016-11-30[crashdump_viewer] Display abort reason when truncatedSiri Hansen
If a crashdump is truncated due to size limit reached, a new 'abort' tag with reason is added at the end of the crashdump. This reason is now displayed along with the truncated-warning.
2016-11-30Merge pull request #805 from matwey/fsf_addrBjörn Gustavsson
Fix FSF mail address
2016-11-29Merge branch 'siri/observer/cdv-no-distribution/OTP-14010' into maintSiri Hansen
* siri/observer/cdv-no-distribution/OTP-14010: [observer] Start crashdump_viewer in a non-distributed node
2016-11-29Merge branch 'siri/observer/remove-unused-files/OTP-14024' into maintSiri Hansen
* siri/observer/remove-unused-files/OTP-14024: [observer] Remove unused files
2016-11-29[crashdump_viewer] Show correct values for 'Object' and 'Memory'Siri Hansen
A bug caused the numer of buckets to be shown in the 'Objects' column, and the number of objects to be shown in the 'Memory' column for ets table in crashdump_viewer. This is now corrected.
2016-11-29Merge branch 'leoliu/tools/fix_edoc_mode' into maintHans Bolinder
* leoliu/tools/fix_edoc_mode: Fix font-locking for @deprecated in erlang-edoc-mode
2016-11-28Use off_heap memory queue for mnesia_tmDan Gudmundsson
Helps when mnesia_tm gets drowned in dirty_writes from remote node.
2016-11-28Merge branch 'victorhge/tools/emacs/icr_indentation/PR-1193' into maintDan Gudmundsson
* victorhge/tools/emacs/icr_indentation/PR-1193: Add an option erlang-icr-indent
2016-11-28Merge branch 'dgud/wx/gl-bugs' into maintDan Gudmundsson
* dgud/wx/gl-bugs: wx: Do not dispatch commands after frequent events Avoid unnecessary length calculations in gl Add option to send prebuilt binaries to multiDrawArrays Fix gl driver pointer error
2016-11-26Fix font-locking for @deprecated in erlang-edoc-modeLeo Liu
2016-11-25Merge branch 'rickard/init-bug/OTP-13911' into maintRickard Green
* rickard/init-bug/OTP-13911: Fix initialization dependencies between time, lock-check and lcnt Conflicts: erts/emulator/sys/unix/sys.c
2016-11-25Merge pull request #1258 from essen/lh-inet-doc-remove-duplicateBjörn Gustavsson
Remove duplicate docs for the priority inet option
2016-11-24Remove duplicate docs for the priority inet optionLoïc Hoguin
2016-11-23Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2016-11-23Merge branch 'hans/ssh/max_packetsize_sftp/OTP-13857' into maintHans Nilsson
2016-11-23Merge branch 'hans/ssh/hostkey_fingerprint_option/OTP-13887' into maintHans Nilsson
2016-11-23Merge branch 'hans/public_key/calc_ssh_fingerprint/OTP-13888' into maintHans Nilsson
2016-11-23Merge branch 'margnus1/hipe-call-elim-crash/PR-1253/OTP-13965' into maintSverker Eriksson
* margnus1/hipe-call-elim-crash/PR-1253: hipe_icode_call_elim: Fix cf elimination crash hipe: Improve error message on internal crashes
2016-11-23Merge branch 'sverker/erts/crash-dump-limit/OTP-14046' into maintSverker Eriksson
again.
2016-11-23erts: Remove one little space in crash dumpSverker Eriksson
2016-11-23Merge branch 'rickard/dirty-scheduling-fixes' into maintRickard Green
OTP-14051 * rickard/dirty-scheduling-fixes: Update etp-commands for dirty schedulers Fix scheduling of system tasks on processes executing dirty Fix call time tracing with dirty schedulers Fix send of exit signal to process executing dirty Fix dirty scheduler process priority Fix alloc-util hard-debug Silence debug warning when no beam jump table is used with dirty schedulers Conflicts: erts/etc/unix/etp-commands.in
2016-11-23Merge branch 'rickard/nif-scheduling-fixes' into maintRickard Green
* rickard/nif-scheduling-fixes: Fix check_process_code() when NifExport is in use - OTP-14048 Fix GC when NifExport is in use - OTP-14049 Fix saving of original arguments when rescheduling via NifExport - OTP-14050
2016-11-23Update primary bootstrapBjörn Gustavsson
2016-11-23Merge branch 'bjorn/compiler/fix-unwanted-warning/ERL-301/OTP-14040' into maintBjörn Gustavsson
* bjorn/compiler/fix-unwanted-warning/ERL-301/OTP-14040: Suppress warnings from v3_kernel when inlining is turned on
2016-11-23Merge branch 'jimdigriz/kernel/rpc-doc/ERL-302/PR-1252' into maintBjörn Gustavsson
* jimdigriz/kernel/rpc-doc/ERL-302/PR-1252: document {yield/nb_yield}() limitation