aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2015-05-12Merge branch 'rickard/timer-optimization/OTP-12650'Rickard Green
2015-05-12Timer fixes, documentation, and test casesRickard Green
2015-05-12ssl: Refactored and corrected sni_fun handlingIngela Anderton Andin
2015-05-12ssl: add option sni_funQijiang Fan
2015-05-12ssl: add tests for SNI server supportQijiang Fan
2015-05-12ssl: docs: SNI server, connection_information/1,2Qijiang Fan
2015-05-12ssl: add ssl:connection_information/[1,2]Qijiang Fan
2015-05-12ssl: deny recursively defined sni_hostsQijiang Fan
2015-05-12ssl: add SNI server supportQijiang Fan
2015-05-12Merge branch 'jv/18/emulator-send-to-error_logger/OTP-12735'Björn-Egil Dahlberg
2015-05-12erts: Fix erts_send_error_term_to_logger memory leakBjörn-Egil Dahlberg
2015-05-12Merge branch 'peppe/webtool/update_vsn'Peter Andersson
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
2015-05-12ssh: Fix ssh_basic_SUITE.erl to work on Windows hostsHans Nilsson
2015-05-12Merge branch 'dgud/mnesia/dirty_error_reason/OTP-12714'Dan Gudmundsson
2015-05-12Merge branch 'ia/ssl/adapt-to-new-public_key-doc'Ingela Anderton Andin
2015-05-12Merge branch 'ia/ssh/height'Ingela Anderton Andin
2015-05-12ssh: Fix typoIngela Anderton Andin
2015-05-12Remove extra @param in javadocVlad Dumitrescu
2015-05-11Update webtool versionPeter Andersson
2015-05-11Merge branch 'peppe/test_tools_vsn_and_deps'Peter Andersson
2015-05-11Merge branch 'peppe/ts/fix_benchmarks'Peter Andersson
2015-05-11Merge branch 'peppe/test_server/fix_merge_problems'Peter Andersson
2015-05-11Merge branch 'sverk/crypto/ec_key_generate/OTP-12733'Sverker Eriksson
2015-05-11crypto: Fix bug in generate_key(ecdh,...)Sverker Eriksson
2015-05-11Merge branch 'kejv/export-digraph-label'Zandra Hird
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
2015-05-11Merge branch 'hans/eldap/cuddle_doc'Hans Nilsson
2015-05-11Merge branch 'derek121/eunit-doc-additions'Zandra Hird
2015-05-11Merge branch 'vladdu/eunit_unicode_OTP11660'Zandra Hird
2015-05-11Merge branch 'zandra/mime-types-config/OTP-12731'Zandra Hird
2015-05-11eldap: Remove doc man.3 warningHans Nilsson
2015-05-11Merge branch 'hans/eldap/cuddle_test_cases'Hans Nilsson
2015-05-11public_key, ssl: Align public_key and ssl docIngela Anderton Andin
2015-05-11Send format and args on process exit to error_loggerJosé Valim
2015-05-11Add erts_send_error_term_to_loggerJosé Valim
2015-05-11Merge branch 'egil/fix-maps-copy-shallow'Björn-Egil Dahlberg
2015-05-11Merge branch 'hans/ssh/check_kex_e_f_in_range/OTP-12649'Hans Nilsson
2015-05-11Merge branch 'aw/native-cpu_sup/OTP-12730'Björn-Egil Dahlberg
2015-05-11Merge branch 'egil/fix-maps-erts_debug-size'Björn-Egil Dahlberg
2015-05-09Correct module in eldap timeout docsjeffweiss
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
2015-05-08Merge branch 'sverk/erts-fp-exception-fixes/OTP-12717'Sverker Eriksson
2015-05-08erts: Fix erts_debug:size/1 for large MapsBjörn-Egil Dahlberg