summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ssh: excluded modules from cover specHans Nilsson2016-12-021-0/+1
|
* Merge pull request #805 from matwey/fsf_addrBjörn Gustavsson2016-11-3039-39/+39
|\ | | | | Fix FSF mail address
| * Fix FSF mail addressMatwey V. Kornilov2015-08-0639-39/+39
| |
* | Merge branch 'siri/observer/cdv-no-distribution/OTP-14010' into maintSiri Hansen2016-11-292-2/+2
|\ \ | | | | | | | | | | | | * siri/observer/cdv-no-distribution/OTP-14010: [observer] Start crashdump_viewer in a non-distributed node
| * | [observer] Start crashdump_viewer in a non-distributed nodeSiri Hansen2016-11-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The shell script (priv/bin/cdv) and bat file (priv/bin/cdv.bat) which can be used for starting crashdump_viewer both started a distributed erlang node. This would cause any attempt at starting a second instance of the crashdump_viewer to fail. To solve this problem, cdv and cdv.bat now use non-distrubuted nodes when starting the crashdump_viewer.
* | | Merge branch 'siri/observer/remove-unused-files/OTP-14024' into maintSiri Hansen2016-11-294-10/+2
|\ \ \ | | | | | | | | | | | | | | | | * siri/observer/remove-unused-files/OTP-14024: [observer] Remove unused files
| * | | [observer] Remove unused filesSiri Hansen2016-11-214-10/+2
| |/ / | | | | | | | | | | | | | | | deleted: priv/crashdump_viewer.tool deleted: priv/crashdump_viewer/collapsd.gif deleted: priv/crashdump_viewer/exploded.gif
* | | Merge branch 'leoliu/tools/fix_edoc_mode' into maintHans Bolinder2016-11-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * leoliu/tools/fix_edoc_mode: Fix font-locking for @deprecated in erlang-edoc-mode
| * | | Fix font-locking for @deprecated in erlang-edoc-modeLeo Liu2016-11-261-1/+1
| | | |
* | | | Merge branch 'victorhge/tools/emacs/icr_indentation/PR-1193' into maintDan Gudmundsson2016-11-281-8/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * victorhge/tools/emacs/icr_indentation/PR-1193: Add an option erlang-icr-indent
| * | | | Add an option erlang-icr-indentVictor Ren2016-11-191-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option makes it possible to customize the indention of if/case/recieve patterns. Before the change, the indentation of 'if' patterns is 3 steps and 'case' patterns is 4 steps. It cannot be changed alone. Some people prefer other styles, for example, zero indentation. case a of true -> do_something(); false -> do_something_else() end. This patch just adds an option `erlang-icr-indent'. Its default value is `nil' which means keeping the legacy behavior. When non-nil, the pattens of if/case/receive are indented according to `erlang-icr-indent'. "(setq erlang-icr-indent 0)" will keep if/case/receive at the same column of the sub-clauses. Change-Id: I10c32e42dbf69cbe187f55223b9aa7824853e493
* | | | | Merge branch 'dgud/wx/gl-bugs' into maintDan Gudmundsson2016-11-289-1098/+1283
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | wx: Do not dispatch commands after frequent eventsDan Gudmundsson2016-11-222-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The user app may want to handle several mouse motion events before drawing new data for example.
| * | | | Avoid unnecessary length calculations in glDan Gudmundsson2016-11-223-189/+336
| | | | |
| * | | | Add option to send prebuilt binaries to multiDrawArraysDan Gudmundsson2016-11-226-990/+1027
| | | | |
| * | | | Fix gl driver pointer errorDan Gudmundsson2016-11-222-46/+46
| | |/ / | |/| | | | | | | | | | | | | | For lists the pointer was not advanced as it should which caused following in-data (if any) to be wrong.
* | | | Merge branch 'rickard/init-bug/OTP-13911' into maintRickard Green2016-11-254-9/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/init-bug/OTP-13911: Fix initialization dependencies between time, lock-check and lcnt Conflicts: erts/emulator/sys/unix/sys.c
| * | | | Fix initialization dependencies between time, lock-check and lcntRickard Green2016-09-264-9/+10
| | | | |
* | | | | Merge pull request #1258 from essen/lh-inet-doc-remove-duplicateBjörn Gustavsson2016-11-251-5/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove duplicate docs for the priority inet option
| * | | | | Remove duplicate docs for the priority inet optionLoïc Hoguin2016-11-241-5/+0
|/ / / / /
* | | | | Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson2016-11-231-21/+30
|\ \ \ \ \
| * | | | | ssh: interrupted_send test suite handle 'close CHANID' msgHans Nilsson2016-11-141-14/+21
| | | | | |
| * | | | | ssh: interrupted_send receive loop reports missing number of bytesHans Nilsson2016-11-141-9/+11
| | | | | |
* | | | | | Merge branch 'hans/ssh/max_packetsize_sftp/OTP-13857' into maintHans Nilsson2016-11-232-3/+20
|\ \ \ \ \ \
| * | | | | | ssh: fix error when large client packet size and small on serverHans Nilsson2016-11-211-0/+3
| | | | | | |
| * | | | | | ssh: testcase for too large packet size on clientHans Nilsson2016-11-211-3/+17
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'hans/ssh/hostkey_fingerprint_option/OTP-13887' into maintHans Nilsson2016-11-236-13/+131
|\ \ \ \ \ \
| * | | | | | ssh: added two test casesHans Nilsson2016-11-181-1/+100
| | | | | | |
| * | | | | | ssh: Removed irrelevant rfc reference in docHans Nilsson2016-11-182-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The rfc 4255 is about fingerprints, but only in the context of dns. Since this is out-of-scope for the Erlang/OTP ssh, the reference is missleading.
| * | | | | | ssh: Add fun and fingerprint to option 'silently_accept_host'Hans Nilsson2016-11-183-8/+31
| | | | | | |
| * | | | | | public_key: type extension (digest_type())Hans Nilsson2016-11-181-2/+3
| | | | | | |
| * | | | | | public_key: ssh host key fingerprint generator addedHans Nilsson2016-11-183-1/+126
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'hans/public_key/calc_ssh_fingerprint/OTP-13888' into maintHans Nilsson2016-11-233-3/+148
|\ \ \ \ \ \
| * | | | | | public_key: ssh host key fingerprint generator addedHans Nilsson2016-11-223-3/+148
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'margnus1/hipe-call-elim-crash/PR-1253/OTP-13965' into maintSverker Eriksson2016-11-234-38/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * margnus1/hipe-call-elim-crash/PR-1253: hipe_icode_call_elim: Fix cf elimination crash hipe: Improve error message on internal crashes
| * | | | | | hipe_icode_call_elim: Fix cf elimination crashMagnus Lång2016-11-192-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hipe_icode_call_elim could in some cases replace an #icode_call{} with control flow with a move instruction. This would break the control flow graph invariants and cause a crash.
| * | | | | | hipe: Improve error message on internal crashesMagnus Lång2016-11-192-37/+62
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print the MFA/module being compiled, and pretty-print the backtrace with lib:format_stacktrace/4. Additionally, make the error_msg/2 macro in hipe.hrl respect the HIPE_LOGGING define, since messages produced by this macro just before runtime shutdown were sometimes lost (since code_server:error_msg/2 is asynchronous).
* | | | | | Merge branch 'sverker/erts/crash-dump-limit/OTP-14046' into maintSverker Eriksson2016-11-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | again.
| * | | | | | erts: Remove one little space in crash dumpSverker Eriksson2016-11-231-1/+1
| | | | | | |
* | | | | | | Merge branch 'rickard/dirty-scheduling-fixes' into maintRickard Green2016-11-237-66/+131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Update etp-commands for dirty schedulersRickard Green2016-11-221-36/+87
| | | | | | | |
| * | | | | | | Fix scheduling of system tasks on processes executing dirtyRickard Green2016-11-221-13/+1
| | | | | | | |
| * | | | | | | Fix call time tracing with dirty schedulersRickard Green2016-11-224-2/+7
| | | | | | | |
| * | | | | | | Fix send of exit signal to process executing dirtyRickard Green2016-11-221-6/+28
| | | | | | | |
| * | | | | | | Fix dirty scheduler process priorityRickard Green2016-11-221-1/+5
| | | | | | | |
| * | | | | | | Fix alloc-util hard-debugRickard Green2016-11-221-7/+2
| | | | | | | |
| * | | | | | | Silence debug warning when no beam jump table is used with dirty schedulersRickard Green2016-11-221-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'rickard/nif-scheduling-fixes' into maintRickard Green2016-11-234-10/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | Fix check_process_code() when NifExport is in useRickard Green2016-11-223-0/+23
| | | | | | | |
| * | | | | | | Fix GC when NifExport is in useRickard Green2016-11-221-0/+11
| | | | | | | |