aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-05-22Merge branch 'bjorn/stdlib/erl_lint'Björn Gustavsson
* bjorn/stdlib/erl_lint: Remove final (?) vestiges of support for parameterized modules
2015-05-22Merge branch 'richcarl/md5-fixes'Björn Gustavsson
* richcarl/md5-fixes: code: Correct type spec for code:make_stub_module/3
2015-05-22Merge branch 'bjorn/compiler/runtime-dependencies'Björn Gustavsson
* bjorn/compiler/runtime-dependencies: Don't make 'compiler' dependent on 'tools' Update runtime depencies for the compiler application
2015-05-22Merge branch 'ia/ssl/SNI-cuddle'Ingela Anderton Andin
* ia/ssl/SNI-cuddle: ssl: Make test case timing independent ssl: Use new API function connection_information in tests ssl: Increase readability ssl: Add cleanup to tests
2015-05-22Merge branch 'dgud/wx/raise-during-stop/OTP-12734'Dan Gudmundsson
* dgud/wx/raise-during-stop/OTP-12734: wx: Fix raise during emulator stoppage
2015-05-21Merge branch 'sverk/ets-tab2file-syn/OTP-12737'Sverker Eriksson
* sverk/ets-tab2file-syn/OTP-12737: stdlib: Add 'sync' option to ets:tab2file/3
2015-05-21Don't make 'compiler' dependent on 'tools'Björn Gustavsson
In a5d724cf240a, a debug option for running eprof on a specific compiler pass was added. That commit added a direct call to the eprof module in the tools application, and therefore the test case otp_SUITE:runtime_dependencies/1 would fail because xref would find a call to the tools application, but tools is not listed as a runtime dependency in compiler.app. Since the 'eprof' option is only likely to be used by compiler maintainers, we don't want a real dependency to the tools application. Therefore, use c:appcall/4 to hide the call to the eprof module (and to report the error nicely if the tools application is missing).
2015-05-21Remove final (?) vestiges of support for parameterized modulesBjörn Gustavsson
Parameterized modules were removed in cdf8060868575, but a few vestiges still remained in erl_lint.
2015-05-21Update runtime dependenciesRickard Green
2015-05-20Revert "Map error logger warnings to warning messages by default"Zandra Hird
This reverts commit 4c4d7fa40e5fb59854724ce74b8aa3546525cb90. This pr is causing some test failures that were missed at first.
2015-05-20Merge branch 'richcarl/warnings-by-default'Zandra Hird
* richcarl/warnings-by-default: Map error logger warnings to warning messages by default OTP-12755
2015-05-20Merge branch 'josevalim/jv-nowarn-bif-clash'Zandra Hird
* josevalim/jv-nowarn-bif-clash: Cache nowarn_bif_clash functions in erl_lint OTP-12754
2015-05-20Merge branch 'josevalim/patch-4'Zandra Hird
* josevalim/patch-4: Speed up linting by not traversing filenames in erl_anno
2015-05-20Merge branch 'evnu/fix-cprof-typo'Zandra Hird
* evnu/fix-cprof-typo: Fix typo in cprof documentation
2015-05-20Merge branch 'saleyn/eunit'Zandra Hird
* saleyn/eunit: Add ?assertReceive(Guard, Timeout) macro to eunit OTP-12753
2015-05-20Merge branch 'jeffweiss/fix_eldap_timeout_documentation'Henrik Nord
* jeffweiss/fix_eldap_timeout_documentation: Correct module in eldap timeout docs
2015-05-20Merge branch 'master' of git-server:otpLars Thorsen
Conflicts: lib/orber/src/orber.app.src
2015-05-20[erl_docgen] Bump versionLars Thorsen
2015-05-20[orber] Update runtime dependency to stdlibLars Thorsen
2015-05-20Merge branch 'peppe/test_server/erl2html2_failure'Peter Andersson
* peppe/test_server/erl2html2_failure: Fix problem not recognizing 'macro' tuple from epp_dodger Fix failing test case and handling double functions on one line OTP-12740
2015-05-20Merge branch 'richcarl/add-uptime-function'Henrik Nord
* richcarl/add-uptime-function: Add uptime() shell command OTP-12752
2015-05-20Merge branch 'MSch/patch-1'Henrik Nord
* MSch/patch-1: Remove erlang:display/1 calls
2015-05-20Merge branch 'mikpe/erl_child_setup-android-breakage'Henrik Nord
* mikpe/erl_child_setup-android-breakage: erl_child_setup.c: fix Android breakage OTP-12751
2015-05-20Merge branch 'fishcakez/check_plt'Hans Bolinder
* fishcakez/check_plt: dialyzer: Document dialyzer:gui() option 'check_plt'
2015-05-20dialyzer: Document dialyzer:gui() option 'check_plt'Hans Bolinder
* Mention the option 'check_plt' among gui() options. * No longer check a PLT twice when the analysis type is 'plt_check'. * No longer raise a case_clause error when checking a PLT finds warnings. Thanks to James Fish.
2015-05-19Merge branch 'vladdu/jinterface_javadoc_fix'Henrik Nord
* vladdu/jinterface_javadoc_fix: Remove extra @param in javadoc OTP-12746
2015-05-19ssl: Make test case timing independentIngela Anderton Andin
Refactored the code and moved client_check before call to ssl_test_lib:check_result(Server, ExpectedSNIHostname) as this call may consume client messages ( which is intentional) but was missed by the test case writer.
2015-05-19ssl: Use new API function connection_information in testsIngela Anderton Andin
connection_info -> connection_information
2015-05-19ssl: Increase readabilityIngela Anderton Andin
2015-05-19ssl: Add cleanup to testsIngela Anderton Andin
2015-05-19Update primary bootstrapBjörn-Egil Dahlberg
2015-05-19Merge branch 'egil/maps-filter/OTP-12745'Björn-Egil Dahlberg
* egil/maps-filter/OTP-12745: stdlib: Use lc to implement maps:map/2 stdlib: Test maps:filter/2 stdlib: Document maps:filter/2 stdlib: Add maps:filter/2
2015-05-19stdlib: Use lc to implement maps:map/2Björn-Egil Dahlberg
2015-05-19stdlib: Test maps:filter/2Björn-Egil Dahlberg
2015-05-18Merge branch 'ia/ssl/sleep-cuddle'Ingela Anderton Andin
* ia/ssl/sleep-cuddle: ssl: Adjust sleep time in test case
2015-05-18ssl: Adjust sleep time in test caseIngela Anderton Andin
Adjust time to make sure "enough" time has elapsed. Will have to do for now.
2015-05-18Merge branch 'ia/ssl/doc/types'Ingela Anderton Andin
* ia/ssl/doc/types: ssl: Align "=" sign in type declarations to decided policy
2015-05-18Merge branch 'ia/ssh/doc/types'Ingela Anderton Andin
* ia/ssh/doc/types: ssh: Align "=" sign in type declarations to decided policy
2015-05-18Add ?assertReceive(Guard, Timeout) macro to eunitSerge Aleynikov
A convenience macro used for testing message passing logic by allowing to fail if a message matching a `Guard` is not received in the mailbox of the current process.
2015-05-18Fix typo in cprof documentationMagnus Ottenklinger
2015-05-18Map error logger warnings to warning messages by defaultRichard Carlsson
Also fix and document the broken +We option.
2015-05-18stdlib: Document maps:filter/2Björn-Egil Dahlberg
2015-05-18stdlib: Add maps:filter/2Björn-Egil Dahlberg
2015-05-18Merge branch 'maint'Zandra Hird
Conflicts: OTP_VERSION lib/ssh/doc/src/ssh.xml lib/ssh/vsn.mk
2015-05-18Updated OTP versionOTP-17.5.4Erlang/OTP
2015-05-18Update release notesErlang/OTP
2015-05-18Merge branch 'hans/ssh/ssh_msg_debug_fun/OTP-12738' into maint-17Erlang/OTP
* hans/ssh/ssh_msg_debug_fun/OTP-12738: ssh: option for handling the SSH_MSG_DEBUG message's printouts
2015-05-18Merge branch 'hans/inets/bad_content_length/OTP-12739' into maint-17Erlang/OTP
* hans/inets/bad_content_length/OTP-12739: inets: reject negative content-length
2015-05-18Merge branch 'evilbluebeaver/iterator_from'Hans Bolinder
* evilbluebeaver/iterator_from: stdlib: Add gb_sets:iterator_from stdlib: Add gb_trees:iterator_from
2015-05-18stdlib: Add gb_sets:iterator_fromHans Bolinder