aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-12-16Merge branch 'maint'Sverker Eriksson
2016-12-16Merge branch 'sverker/cuddle-code_SUITE-versions' into maintSverker Eriksson
* sverker/cuddle-code_SUITE-versions: erts: Fix hanging race in code_SUITE:versions
2016-12-16Merge branch 'maint'Sverker Eriksson
2016-12-16Merge pull request #1270 from kostis/hipe-testSverker Eriksson
hipe: one more test file and some cleanups
2016-12-16Merge branch 'maint'Björn Gustavsson
* maint: Allow escripts with only two lines Add project-wide Emacs settings file
2016-12-16Merge pull request #1279 from legoscia/emacs-dir-localsBjörn Gustavsson
Add project-wide Emacs settings file
2016-12-16Merge pull request #1275 from pjhades/fix/escriptBjörn Gustavsson
Allow escripts with only two lines OTP-14098
2016-12-16Merge branch 'maint'Hans Nilsson
2016-12-16Merge branch 'hans/eldap/cover_spec' into maintHans Nilsson
2016-12-16Merge branch 'maint'Ingela Anderton Andin
2016-12-16Merge branch 'ingela/inets/httpc-redirect-host-header/ERL-316/OTP-14097' ↵Ingela Anderton Andin
into maint * ingela/inets/httpc-redirect-host-header/ERL-316/OTP-14097: inets: httpc - Correct redirection host header
2016-12-16Merge branch 'maint'Ingela Anderton Andin
2016-12-16Merge branch 'ingela/inets/httpc-PATCH-doc' into maintIngela Anderton Andin
* ingela/inets/httpc-PATCH-doc: inets: httpc - patch method missing in doc
2016-12-15Merge branch 'maint'Hans Nilsson
2016-12-15Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2016-12-15eldap: add cover spec for nightly testsHans Nilsson
2016-12-15Merge branch 'maint'Björn-Egil Dahlberg
2016-12-15Merge branch 'egil/erts/handle-sigterm-nicely/OTP-14085' into maintBjörn-Egil Dahlberg
* egil/erts/handle-sigterm-nicely/OTP-14085: erts: Document SIGTERM handler erts: Add SIGTERM signal handler
2016-12-15erts: Document SIGTERM handlerBjörn-Egil Dahlberg
2016-12-15Merge branch 'maint'Björn-Egil Dahlberg
2016-12-15Merge branch 'egil/doc-maps-type/ERL-197/OTP-14096' into maintBjörn-Egil Dahlberg
* egil/doc-maps-type/ERL-197/OTP-14096: doc: Enchance map pair optional/mandatory notes doc: Change "stands for" to "denotes" in typespec Remove whitespace errors
2016-12-15Merge branch 'maint'Björn Gustavsson
* maint: Create CONTRIBUTING.md (#1278) Make sure that Travis fails when test cases fail Don't include problematic test cases in smoke test
2016-12-15Create CONTRIBUTING.md (#1278)Björn Gustavsson
According to https://help.github.com/articles/setting-guidelines-for-repository-contributors, a link to a file named CONTRIBUTING.md will be shown when someone is about to create a pull request. That is more visible than our Wiki pages, which are easy to miss. Create the CONTRIBUTING.md file, based on the existing Wiki page https://github.com/erlang/otp/wiki/Contribution-Guidelines.
2016-12-15Merge pull request #1277 from bjorng/bjorn/travis-run-testsBjörn Gustavsson
Make sure that Travis fails when test cases fail
2016-12-14inets: httpc - Correct redirection host headerIngela Anderton Andin
RFC2616 Sect 14.23: The Host request-header field specifies the Internet host AND port number.
2016-12-14ssh: [test] property test cuddlingHans Nilsson
2016-12-14ssh: [test] remove 'known_hosts' interference in test suiteHans Nilsson
2016-12-14ssh: [test] Move fn random_chars/1 to ssh_test_libHans Nilsson
2016-12-14ssh: [test] Put tstflg values in a proplistHans Nilsson
2016-12-14ssh: [test] Extend timetrap in test caseHans Nilsson
2016-12-14Merge tag 'OTP-19.2'Dan Gudmundsson
=== OTP-19.2 === Changed Applications: - common_test-1.13 - compiler-7.0.3 - crypto-3.7.2 - dialyzer-3.0.3 - edoc-0.8.1 - erl_docgen-0.6.1 - erl_interface-3.9.2 - erts-8.2 - eunit-2.3.2 - hipe-3.15.3 - inets-6.3.4 - kernel-5.1.1 - mnesia-4.14.2 - observer-2.3 - odbc-2.12 - parsetools-2.1.4 - public_key-1.3 - runtime_tools-1.11 - sasl-3.0.2 - ssh-4.4 - ssl-8.1 - stdlib-3.2 - syntax_tools-2.1.1 - tools-2.9 - wx-1.8 Unchanged Applications: - asn1-4.0.4 - cosEvent-2.2.1 - cosEventDomain-1.2.1 - cosFileTransfer-1.2.1 - cosNotification-1.2.2 - cosProperty-1.2.1 - cosTime-1.2.2 - cosTransactions-1.3.2 - debugger-4.2.1 - diameter-1.12.1 - eldap-1.2.2 - et-1.6 - gs-1.6.2 - ic-4.4.2 - jinterface-1.7.1 - megaco-3.18.1 - orber-3.8.2 - os_mon-2.4.1 - otp_mibs-1.1.1 - percept-0.9 - reltool-0.7.2 - snmp-5.2.4 - typer-0.9.11 - xmerl-1.3.12 * tag 'OTP-19.2': Updated OTP version Prepare release Conflicts: OTP_VERSION
2016-12-13Allow escripts with only two linesJing Peng
The current implementation assumes that escripts all have at least three lines. But according to the escript documentation, comments on the second line and emulator flags on the third line are all optional. Thus escripts with only two lines -- shebang on the first line and code on the second line -- will not run. This commit fixes the problem by rearranging the escript header parsing logic, and recognize the escript body on the second line if the header only contains a line of shebang.
2016-12-13inets: httpc - patch method missing in docIngela Anderton Andin
2016-12-13Add project-wide Emacs settings fileMagnus Henoch
Add a .dir-locals.el file, which applies indentation-related settings when editing any file in the project with Emacs.
2016-12-12doc: Enchance map pair optional/mandatory notesBjörn-Egil Dahlberg
2016-12-12doc: Change "stands for" to "denotes" in typespecBjörn-Egil Dahlberg
2016-12-12Remove whitespace errorsBjörn-Egil Dahlberg
2016-12-12Make sure that Travis fails when test cases failBjörn Gustavsson
2016-12-12Don't include problematic test cases in smoke testBjörn Gustavsson
In time_SUITE, the univ_to_local/1 and local_to_univ/1 test cases will fail if they are run outside the CET timezone. The consistency/1 test case uses is not reliable in March and October because it uses a simplified model for when the switch to/from DST is done.
2016-12-12Update primary bootstrapBjörn Gustavsson
2016-12-12Merge branch 'bjorn/compiler/beam_type'Björn Gustavsson
* bjorn/compiler/beam_type: beam_type: Minimize number of regs in test_heap instructions
2016-12-12Merge pull request #1266 from hawk/hm/gen_server-client-stacktraceBjörn Gustavsson
Printout the client stacktrace when a gen_server crashes OTP-14089
2016-12-09Merge margnus1/hipe-arm-trampoline/PR-1272/OTP-14088Sverker Eriksson
erts: Fix missing HiPE trampolines on arm (master only)
2016-12-09beam_type: Minimize number of regs in test_heap instructionsBjörn Gustavsson
The beam_type may pass move and recalculates test_heap instructions. The number of live registers are not always the lowest. Minimize the number of registers by running beam_utils:live_opt/1 one more time.
2016-12-09Updated OTP versionOTP-19.2Erlang/OTP
2016-12-09Prepare releaseErlang/OTP
2016-12-09Merge pull request #1273 from bjorng/bjorn/compiler/deterministic/ERL-310Björn Gustavsson
Add option 'deterministic' for reproducible builds OTP-14087
2016-12-09Merge branch 'bjorn/crypto/support-openssl-1.1'Björn Gustavsson
* bjorn/crypto/support-openssl-1.1: Support OpenSSL 1.1.0 crypto.c: Disable broken code for ChaCha and Poly1305 configure.in: Fix configure test for usable OpenSSL configure.in: Fix test for SSL with Kerberos OTP-13900
2016-12-08erts: Fix hanging race in code_SUITE:versionsSverker Eriksson
Monitor first, then ask to terminate.
2016-12-08Printout client stacktrace when a gen_server crashesHåkan Mattsson
When a gen_server crashes it is in many cases helpful to know in which context its client made its call.