aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2013-08-28Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-08-28ssl: Make the ssl manager name for erlang distribution over SSL/TLSIngela Anderton Andin
relative to the module name of the ssl_manager. This can be beneficial when making tools that rename modules for internal processing in the tool.
2013-08-28Merge branch 'maint'Fredrik Gustafsson
2013-08-28Merge branch 'tab/tramp_emacs_erl/OTP-11270' into maintFredrik Gustafsson
* tab/tramp_emacs_erl/OTP-11270: tools: In Emacs it is possible to remotely edit a file, by opening for example /ssh:somehost.com:/path/to/file.erl. In Emacs, the feature that makes this possible, is called TRAMP. When compiling such a file, by typing C-c C-k, an inferior Erlang shell is opened on the remote host, but the compilation expression that was evaluated in the remote Erlang shell was:
2013-08-28Merge branch 'maint'Fredrik Gustafsson
2013-08-28Merge branch 'fredrik/ssl/log_alert_doc/OTP-11271' into maintFredrik Gustafsson
* fredrik/ssl/log_alert_doc/OTP-11271: ssl: documentation regarding log_alert
2013-08-28Merge branch 'maint'Hans Bolinder
* maint: Fix a Yecc bug
2013-08-28Fix a Yecc bugHans Bolinder
A bug causing Yecc to generate badly formed parsers when encountering very simple recursive rules has been fixed. Thanks to Eric Pailleau for reporting the bug.
2013-08-27ssl: documentation regarding log_alertFredrik Gustafsson
2013-08-27tools:Fredrik Gustafsson
In Emacs it is possible to remotely edit a file, by opening for example /ssh:somehost.com:/path/to/file.erl. In Emacs, the feature that makes this possible, is called TRAMP. When compiling such a file, by typing C-c C-k, an inferior Erlang shell is opened on the remote host, but the compilation expression that was evaluated in the remote Erlang shell was: c("/ssh:somehost.com:/path/to/file", [...]). which resulted in a "no such file or directory" error. This commit changes the compilation expression into: c("/path/to/file", [...]). for files opened remotely via TRAMP. The file name is adjusted similarly when compiling .yrl and .xrl files. In a buffer opened remotely, the Elisp function buffer-file-name returns the full path with TRAMP syntax. In this example it would be "/ssh:somehost.com:/path/to/file.erl". A new function, erlang-local-buffer-file-name, has been introduced, which peels off the TRAMP syntax on remotely opened files, while for locally opened files, it just calls buffer-file-name.
2013-08-26Merge branch 'maint'Fredrik Gustafsson
2013-08-26Merge branch 'nox/match-context-return/OTP-11247' into maintFredrik Gustafsson
* nox/match-context-return/OTP-11247: Added primary bootstrap Forbid returning a match context in beam_validator
2013-08-26Merge branch 'maint'Fredrik Gustafsson
2013-08-26Merge branch 'sze/edlin_understand_keys/OTP-11251' into maintFredrik Gustafsson
* sze/edlin_understand_keys/OTP-11251: Added primary bootstrap erts: fixed documentation regarding tty and arrow keys make edlin understand a few important control keys
2013-08-26Merge branch 'maint'Fredrik Gustafsson
2013-08-26Merge branch 'alexrp/export_edge/OTP-11266' into maintFredrik Gustafsson
* alexrp/export_edge/OTP-11266: Export the edge/0 type from the digraph module
2013-08-23Merge branch 'maint'Fredrik Gustafsson
2013-08-23Merge branch 'epa/add_fd_usage_in_rb/OTP-11252' into maintFredrik Gustafsson
* epa/add_fd_usage_in_rb/OTP-11252: kernel: sasl: fixed rb.xml docs Add Fd usage in rb logging
2013-08-23Merge branch 'maint'Fredrik Gustafsson
2013-08-23Merge branch 'maint-r16' into maintFredrik Gustafsson
2013-08-23Merge branch 'maint-r15' into maint-r16Fredrik Gustafsson
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_lib/http_transport.erl lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/src/ssl.erl lib/ssl/src/ssl_internal.hrl lib/ssl/src/tls_connection.erl lib/ssl/vsn.mk
2013-08-22Merge branch 'maint'Fredrik Gustafsson
2013-08-22Merge branch 'jw/fix-httpd-erl-script-nocache/OTP-11260' into maintFredrik Gustafsson
* jw/fix-httpd-erl-script-nocache/OTP-11260: inets: added simple testcase for option erl_script_nocache Fix httpd config option 'erl_script_nocache'
2013-08-22Merge branch 'maint'Hans Bolinder
* maint: Correct the specifications of io_lib:fread/2,3
2013-08-21Correct the specifications of io_lib:fread/2,3Hans Bolinder
Thanks to Chris King and Kostis Sagonas for pinpointing the bug.
2013-08-21erts: Add option to include nifs staticallyLukas Larsson
Both crypto and asn1 are supported.
2013-08-21Update release notesErlang/OTP
2013-08-21Merge branch 'fredrik/inets/ssl/fixup_log_alert_option/OTP-11259' into maint-r15Erlang/OTP
* fredrik/inets/ssl/fixup_log_alert_option/OTP-11259: [inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel added as option to inets conf file
2013-08-21inets: added simple testcase for option erl_script_nocacheFredrik Gustafsson
2013-08-21Merge branch 'maint'Fredrik Gustafsson
2013-08-21Merge branch 'fh/start-all/OTP-11250' into maintFredrik Gustafsson
* fh/start-all/OTP-11250: kernel: fix documentation regarding ensure_all_started endtag Updated primary bootstrap Add application:ensure_all_started/1-2
2013-08-21[inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel ↵Fredrik Gustafsson
added as option to inets conf file
2013-08-21Merge branch 'maint'Hans Bolinder
* maint: Fix a Dets bug concerning traversal of tables
2013-08-21Merge branch 'hb/stdlib/dets_bugfix/OTP-11245' into maintHans Bolinder
* hb/stdlib/dets_bugfix/OTP-11245: Fix a Dets bug concerning traversal of tables
2013-08-21Merge branch 'maint'Fredrik Gustafsson
2013-08-21Merge branch 'fredrik/ssh/correct_doc_timeout/OTP-11249' into maintFredrik Gustafsson
* fredrik/ssh/correct_doc_timeout/OTP-11249: ssh: clarified timeout options
2013-08-21Merge branch 'maint'Hans Bolinder
* maint: Fix a bug in the linter regarding the 'fun M:F/A' construct
2013-08-21Merge branch 'hb/stdlib/erl_lint_fix/OTP-11256' into maintHans Bolinder
* hb/stdlib/erl_lint_fix/OTP-11256: Fix a bug in the linter regarding the 'fun M:F/A' construct
2013-08-21Merge branch 'maint'Fredrik Gustafsson
2013-08-21Merge branch 'lpg/openssh_zlib/OTP-11256' into maintFredrik Gustafsson
* lpg/openssh_zlib/OTP-11256: ssh: added basic connection testcase for openssh zlib Add openssh_zlib compression type to ssh_transport
2013-08-20ssh: added basic connection testcase for openssh zlibFredrik Gustafsson
2013-08-20Fix a bug in the linter regarding the 'fun M:F/A' constructHans Bolinder
If the fun M:F/A construct was used erroneously the linter could crash. Thanks to Mikhail Sobolev for reporting the bug.
2013-08-20kernel: fix documentation regarding ensure_all_started endtagFredrik Gustafsson
2013-08-20ssh: clarified timeout optionsFredrik Gustafsson
2013-08-19Merge branch 'maint'Björn Gustavsson
* maint: Fix compiler crash for 'B and B' guard
2013-08-19Merge branch 'bjorn/compiler/beam_bool-crash/OTP-11240' into maintBjörn Gustavsson
* bjorn/compiler/beam_bool-crash/OTP-11240: Fix compiler crash for 'B and B' guard
2013-08-19Merge branch 'maint'Fredrik Gustafsson
2013-08-19Merge branch 'fredrik/mnesia/fix_removing_bup/OTP-11241' into maintFredrik Gustafsson
* fredrik/mnesia/fix_removing_bup/OTP-11241: mnesia: fix removal of bup file if not mnesia is started
2013-08-19Fix a Dets bug concerning traversal of tablesHans Bolinder
The bug was introduced in R16B. Thanks to Manuel Durán Aguete.
2013-08-19Merge branch 'maint'Fredrik Gustafsson