aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-01-25Merge branch 'maint'Ingela Anderton Andin
2017-01-25Merge branch 'ingela/ssl/pem-chache-own-process/OTP-13874' into maintIngela Anderton Andin
* ingela/ssl/pem-chache-own-process/OTP-13874: ssl: Move PEM cache to a dedicated process
2017-01-25Merge branch 'egil/percept/remove-application/OTP-14163'Björn-Egil Dahlberg
* egil/percept/remove-application/OTP-14163: ssl: Remove percept from benchmark otp: Don't mention percept in documentation runtime_tools: Remove percept percept: Remove application
2017-01-24Merge branch 'maint'Björn-Egil Dahlberg
2017-01-24Merge branch 'schimulkar/os_mon/linux-on-ibm-z/PR-1309/OTP-14161' into maintBjörn-Egil Dahlberg
* schimulkar/os_mon/linux-on-ibm-z/PR-1309/OTP-14161: Adding s390x support
2017-01-24Merge branch 'maint'Björn-Egil Dahlberg
2017-01-24Merge pull request #1314 from ngrash/fix-jira-issue-statusBjörn-Egil Dahlberg
Fix JIRA issue status for wanted contributions
2017-01-23Merge branch 'sverker/zlib-inflateGetDictionary-mcintosh'Sverker Eriksson
* sverker/zlib-inflateGetDictionary-mcintosh: erts: Fix zlib crash on mac for inflateGetDictionary
2017-01-23Merge branch 'maint'Sverker Eriksson
2017-01-23Merge branch 'sverker/cuddle-port_trace_SUITE' into maintSverker Eriksson
* sverker/cuddle-port_trace_SUITE: erts: Fix port_trace_SUITE to join threads
2017-01-23Merge branch 'maint'Hans Nilsson
2017-01-23Merge branch 'hans/ssh/ssh_dbg_module' into maintHans Nilsson
2017-01-23ssh: ssh_dbg now reports HELLO msgs and timestampsHans Nilsson
2017-01-23Merge branch 'sverker/ASSERT_IN_ENV'Sverker Eriksson
* sverker/ASSERT_IN_ENV: erts: Add macro ERTS_PROC_LOCKS_HIGHER_THAN erts: Cleanup and extra assertions in nif_SUITE.c erts: Cleanup enif_make_reverse_list erts: Add assertions for correct ErlNifEnv erts: Make erts_dbg_within_proc available # Conflicts: # erts/emulator/beam/erl_gc.h
2017-01-23Merge branch 'hans/ssh/optimize/OTP-14160'Hans Nilsson
2017-01-22Fix JIRA issue status for wanted contributionsNico
2017-01-20Merge branch 'maint'Hans Nilsson
2017-01-20Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-01-20ssl: Remove percept from benchmarkBjörn-Egil Dahlberg
2017-01-20otp: Don't mention percept in documentationBjörn-Egil Dahlberg
2017-01-20runtime_tools: Remove perceptBjörn-Egil Dahlberg
2017-01-20Merge branch 'maint'Björn-Egil Dahlberg
2017-01-20Merge branch 'egil/cuddle-more-tests' into maintBjörn-Egil Dahlberg
* egil/cuddle-more-tests: runtime_tools: Fix utf-8 encoding in LTTng.xml Handle unicode in path in test
2017-01-19ssh: fix mpint-bug in property testsHans Nilsson
2017-01-19Merge branch 'hans/ssh/benchmarks'Hans Nilsson
2017-01-19Merge branch 'maint'Hans Nilsson
2017-01-19Merge branch 'hans/ssh/reduce_decrypt_error_info_leakage/OTP-14109' into maintHans Nilsson
2017-01-19Merge branch 'rickard/proc-lookup-inc-refc'Rickard Green
* rickard/proc-lookup-inc-refc: Introduce erts_proc_lookup_inc_refc()
2017-01-19Introduce erts_proc_lookup_inc_refc()Rickard Green
2017-01-19ssl: Move PEM cache to a dedicated processIngela Anderton Andin
The PEM cache handling has proven to be too disruptive of the manager process.
2017-01-18ssh: increased benchmark suite timetrapHans Nilsson
2017-01-18ssh: fixed benchmark bug for gcm-modesHans Nilsson
The bug has not affected existing results because no gcm-modes has been measured.
2017-01-18ssh: Reduce info leakage on decrypt errorsHans Nilsson
Use same message when there are packet errors like too long length, MAC, decrypt or decode errors. This is regarded as good practise to prevent some attacks
2017-01-18Merge branch 'maint'Raimo Niskanen
2017-01-18Merge branch 'raimo/snmp/compile-enum-refinement/ERL-325/OTP-14145' into maintRaimo Niskanen
* raimo/snmp/compile-enum-refinement/ERL-325/OTP-14145: Bump version Do without compilation time in SNMP versions[12]() Test enum refinement MIB Fix enum refinement in usertype in SYNTAX
2017-01-18Merge branch 'maint'Hans Nilsson
2017-01-18Merge pull request #1311 from leoliu/fix-ERL-336Hans Nilsson
Add a missing aes_gcm -spec clause to crypto:block_encrypt/4
2017-01-17Merge branch 'maint'Björn-Egil Dahlberg
2017-01-17Merge branch 'egil/cuddle-tests' into maintBjörn-Egil Dahlberg
* egil/cuddle-tests: stdlib: Increase timetrap for rand_SUITE common_test: Increase timetrap for cth_hooks_SUITE compiler: Increase timetrap timeouts for lc_SUITE
2017-01-17runtime_tools: Fix utf-8 encoding in LTTng.xmlBjörn-Egil Dahlberg
2017-01-17Merge branch 'maint'Sverker Eriksson
2017-01-17Merge branch 'sverker/trace_gc-bug/OTP-14154' into maintSverker Eriksson
* sverker/trace_gc-bug: erts: Fix GC tracing to use temp heap erts: Assert sufficient space need after GC
2017-01-17Handle unicode in path in testBjörn-Egil Dahlberg
2017-01-17Bump versionRaimo Niskanen
2017-01-17Do without compilation time in SNMP versions[12]()Raimo Niskanen
2017-01-17Merge branch 'maint'Rickard Green
* maint: Remove debug printout and unnecessary GC
2017-01-17Merge branch 'rickard/hipe_handle_exception' into maintRickard Green
OTP-14153 * rickard/hipe_handle_exception: Remove debug printout and unnecessary GC
2017-01-17erts: Fix zlib crash on mac for inflateGetDictionarySverker Eriksson
Work around broken build system by checking actual zlib version in runtime.
2017-01-17Remove debug printout and unnecessary GCRickard Green
2017-01-17Merge branch 'maint'Hans Nilsson
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 03:15:26 +0000