aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-05-12Merge branch 'peppe/webtool/update_vsn'Peter Andersson
* peppe/webtool/update_vsn: Update webtool version
2015-05-12ssh: Align "=" sign in type declarations to decided policyIngela Anderton Andin
2015-05-12Add uptime() shell commandRichard Carlsson
2015-05-12Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
* hans/ssh/cuddle_tests: ssh: Fix ssh_basic_SUITE.erl to work on Windows hosts
2015-05-12ssh: Fix ssh_basic_SUITE.erl to work on Windows hostsHans Nilsson
The test cases id_string_no_opt_client id_string_own_string_client id_string_random_client didn't work on MS Windows. This commit adds {packet,line} to get the whole version exchange line in one packet on all architectures. It also adds timeouts to speed up failures in those test cases.
2015-05-12Merge branch 'dgud/mnesia/dirty_error_reason/OTP-12714'Dan Gudmundsson
* dgud/mnesia/dirty_error_reason/OTP-12714: mnesia: dirty error messages did not behave as documented
2015-05-12wx: Fix raise during emulator stoppageDan Gudmundsson
When emulator is stopped all drivers are stopped but not unloaded and since the clean wx thread stoppage code was in unload callback it was not called and could cause crashes.
2015-05-12Merge branch 'ia/ssl/adapt-to-new-public_key-doc'Ingela Anderton Andin
* ia/ssl/adapt-to-new-public_key-doc: ssl: Align "=" sign in type declarations to decided policy public_key: Align "=" sign in type declarations to decided policy public_key, ssl: Align public_key and ssl doc
2015-05-12Merge branch 'ia/ssh/height'Ingela Anderton Andin
* ia/ssh/height: ssh: Fix typo
2015-05-12ssh: Fix typoIngela Anderton Andin
Option height was misspelled in the code. Fix code but recognize the mispellt option for backwards compatible reasons.
2015-05-12Remove extra @param in javadocVlad Dumitrescu
This gives an error when building the docs.
2015-05-11Update webtool versionPeter Andersson
2015-05-11Merge branch 'peppe/test_tools_vsn_and_deps'Peter Andersson
* peppe/test_tools_vsn_and_deps: Update version numbers and app dependencies
2015-05-11Merge branch 'peppe/ts/fix_benchmarks'Peter Andersson
* peppe/ts/fix_benchmarks: Fix problem with OTP benchmark tests failing to run
2015-05-11Merge branch 'peppe/test_server/fix_merge_problems'Peter Andersson
* peppe/test_server/fix_merge_problems: Fix remaining issues in source code parser
2015-05-11Merge branch 'sverk/crypto/ec_key_generate/OTP-12733'Sverker Eriksson
* sverk/crypto/ec_key_generate/OTP-12733: crypto: Fix bug in generate_key(ecdh,...)
2015-05-11crypto: Fix bug in generate_key(ecdh,...)Sverker Eriksson
that could cause VM crash on faulty input.
2015-05-11Merge branch 'kejv/export-digraph-label'Zandra Hird
* kejv/export-digraph-label: digraph: export label type
2015-05-11ssl: Align "=" sign in type declarations to decided policyIngela Anderton Andin
2015-05-11public_key: Align "=" sign in type declarations to decided policyIngela Anderton Andin
2015-05-11Merge branch 'egil/erts/high_accuracy_sleep/OTP-12236'Björn-Egil Dahlberg
* egil/erts/high_accuracy_sleep/OTP-12236: erts: Add high accuracy poll timeouts
2015-05-11Merge branch 'hans/eldap/cuddle_doc'Hans Nilsson
* hans/eldap/cuddle_doc: eldap: Remove doc man.3 warning
2015-05-11Merge branch 'derek121/eunit-doc-additions'Zandra Hird
* derek121/eunit-doc-additions: Add mention of ?assertNotMatch and ?assertNotEqual
2015-05-11Merge branch 'vladdu/eunit_unicode_OTP11660'Zandra Hird
* vladdu/eunit_unicode_OTP11660: OTP-11660: make eunit unicode safe
2015-05-11Merge branch 'zandra/mime-types-config/OTP-12731'Zandra Hird
* zandra/mime-types-config/OTP-12731: make it possible to use a file to configure mime types
2015-05-11eldap: Remove doc man.3 warningHans Nilsson
2015-05-11Merge branch 'hans/eldap/cuddle_test_cases'Hans Nilsson
* hans/eldap/cuddle_test_cases: eldap: Test suite uppdated to new time handling
2015-05-11public_key, ssl: Align public_key and ssl docIngela Anderton Andin
Make sure that links from ssl to public_key work. OTP-12670 - Ignoring 1.2 extension in 1.0 or TLS-1.1 solved by 5edda23ee854038c9d4bcddd0d676ee0ffd20da5 is mentioned here to make the release scripts happy, as the branch solving this accidently had a name ending 1267 instead of 12670
2015-05-11Send format and args on process exit to error_loggerJosé Valim
Previously, the emulator would generate a whole string with values and call the error_logger passing "~s~n". This commit changes it to a format string containing ~p with the respective values as arguments.
2015-05-11Add erts_send_error_term_to_loggerJosé Valim
This function allows us to send format and args to the logger which can then be formatted and customized from Erlang land.
2015-05-11Merge branch 'egil/fix-maps-copy-shallow'Björn-Egil Dahlberg
* egil/fix-maps-copy-shallow: erts: Make hashmap_get halfword safe erts: Fix ETS db_has_variable check for large Maps stdlib: Strengthen ETS Maps tests erts: Fix copy shallow for large Maps stdlib: Strengthen ETS Maps tests erts: ETS ordered_set cannot use it's optimization with Maps stdlib: Strengthen ETS Maps tests stdlib: Refactor away ?line macro
2015-05-11Merge branch 'hans/ssh/check_kex_e_f_in_range/OTP-12649'Hans Nilsson
* hans/ssh/check_kex_e_f_in_range/OTP-12649: ssh: Check e and f parameters in kexdh
2015-05-11Merge branch 'aw/native-cpu_sup/OTP-12730'Björn-Egil Dahlberg
* aw/native-cpu_sup/OTP-12730: erts: Fix configure.in os_mon: rename send() to sendi() in cpu_sup.c os_mon: cpu_sup should use native sysctl/libkvm calls on BSD
2015-05-11Merge branch 'egil/fix-maps-erts_debug-size'Björn-Egil Dahlberg
* egil/fix-maps-erts_debug-size: erts: Fix erts_debug:size/1 for large Maps erts: Simple test of erts_debug:size/1 of Maps
2015-05-09Correct module in eldap timeout docsjeffweiss
Prior to this commit, the `eldap` documentation for the timeouts of `search/2` and `start_tls/3` referenced `erl_tar:open/2` instead of `eldap:open/2`. The relative link was correct, only the link label mistakenly pointed to `erl_tar`. This error was introduced in e9a97c3cfd7615e3efd0cbf1632a78b868fda49c. This commit corrects that mistake.
2015-05-09Fix problem with OTP benchmark tests failing to runPeter Andersson
2015-05-09Fix remaining issues in source code parserPeter Andersson
2015-05-08Merge branch 'sg2342/fix_freebsd_sendfile/OTP-12720'Sverker Eriksson
* sg2342/fix_freebsd_sendfile/OTP-12720: Fix FreeBSD sendfile
2015-05-08Merge branch 'sverk/erts-fp-exception-fixes/OTP-12717'Sverker Eriksson
* sverk/erts-fp-exception-fixes/OTP-12717: erts: Disable float exceptions for clang/llvm erts: Increase buffer in erts_fp_check_init_error
2015-05-08erts: Fix erts_debug:size/1 for large MapsBjörn-Egil Dahlberg
2015-05-08erts: Simple test of erts_debug:size/1 of MapsBjörn-Egil Dahlberg
2015-05-08Update version numbers and app dependenciesPeter Andersson
2015-05-08Merge branch 'rickard/timer-optimization/OTP-12650'Rickard Green
* rickard/timer-optimization/OTP-12650: Optimized timer implementation Reusable red-black tree implementation Conflicts: erts/emulator/beam/erl_bif_timer.c
2015-05-08Merge branch 'rickard/time-improvement/OTP-11997'Rickard Green
* rickard/time-improvement/OTP-11997: Allow execution of estone suite on pre OTP-18 systems Add parallel time monotonicity test-case Replace usage of erlang:now() in line-tracing Replace erlang:now() usage in emulator suite Replace erlang:now() usage in system suite Misc time improvements
2015-05-08Optimized timer implementationRickard Green
2015-05-08erts: Make hashmap_get halfword safeBjörn-Egil Dahlberg
2015-05-08Merge branch 'ia/public_key/improve_docs'Ingela Anderton Andin
* ia/public_key/improve_docs: public_key: Add clarifications public_key: Align types with removal of legacy ASN.1 flags public_key: Align to alphabetical order public_key: Correct application names and typos public_key: Change structure to what editor intended Editorial changes
2015-05-08ssh: Check e and f parameters in kexdhHans Nilsson
rfc 4253 says in section 8 that: "Values of 'e' or 'f' that are not in the range [1, p-1] MUST NOT be sent or accepted by either side. If this condition is violated, the key exchange fails." This commit implements the reception check.
2015-05-08Update runtime depencies for the compiler applicationBjörn Gustavsson
2015-05-08Merge branch 'bjorn/asn1/doc'Björn Gustavsson
* bjorn/asn1/doc: asn1_spec: Correct obsolete details about compiler options Update asn1 documentation