aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2015-06-17Merge branch 'nybek/fix_so_linger_zero__simple'Raimo Niskanen
2015-06-16Merge branch 'ia/ssl/test-cuddle'Ingela Anderton Andin
2015-06-16Merge branch 'rickard/glb-inline'Rickard Green
2015-06-16Merge branch 'hirotnk/fun-doc-syntax-ref'Zandra Hird
2015-06-16Merge branch 'mururu/fix-typo'Zandra Hird
2015-06-16Fix typo in commentYuki Ito
2015-06-16Merge branch 'nybek/fix_supervisor_get_childspec'Zandra Hird
2015-06-16Merge branch 'ia/ssh/doc/message-types'Ingela Anderton Andin
2015-06-16ssh: Modernize type definitionsIngela Anderton Andin
2015-06-16Merge branch 'tomas-abrahamsson/patch-1'Henrik Nord
2015-06-16Merge branch 'mhssler/doc-os-unsetenv-unicode'Henrik Nord
2015-06-16Merge branch 'ia/inets/deprecate'Ingela Anderton Andin
2015-06-16inets: Fix race condition in httpcIngela Anderton Andin
2015-06-16inets: Remove use of httpd_conf:clean/1 and httpd_conf:custom_clean/3Ingela Anderton Andin
2015-06-16Merge branch 'peppe/common_test/remove_void_in_doc'Peter Andersson
2015-06-16Remove void() type in documentationPeter Andersson
2015-06-16Merge branch 'peppe/common_test/ct_run_start_and_help'Peter Andersson
2015-06-15Unbreak global inliningRickard Green
2015-06-15inets: Remove use of httpd_conf:make_integer/1Ingela Anderton Andin
2015-06-15inets: Deprecate functions in util module httpd_conf.erlIngela Anderton Andin
2015-06-15Merge branch 'rickard/+zebwt/OTP-12830'Rickard Green
2015-06-15ETS busy wait optionRickard Green
2015-06-15Merge branch 'hamt_bin2term'Sverker Eriksson
2015-06-15erts: Add erts_factory_trim_and_closeSverker Eriksson
2015-06-15erts: Optimize driver_deliver_termSverker Eriksson
2015-06-15ssl: Remove unnecessary suite callbackIngela Anderton Andin
2015-06-15Merge branch 'rc/robustify-module_info/OTP-12820'Björn-Egil Dahlberg
2015-06-15erts: Remove hashmap probabilistic heap overestimationSverker Eriksson
2015-06-15Merge branch 'sverk/map-merge-trap'Sverker Eriksson
2015-06-15Merge branch 'sverk/ets-file2tab-preserve-opts/OTP-12814'Sverker Eriksson
2015-06-15Merge branch 'ia/ssl/test-fips'Ingela Anderton Andin
2015-06-15erts: Optimize maps:mergeSverker Eriksson
2015-06-15erts: Yield in maps:mergeSverker Eriksson
2015-06-15Merge branch 'hb/dialyzer/fix_opaque_types/OTP-12493'Hans Bolinder
2015-06-15dialyzer: Fix a minor bug concerning opaque typesHans Bolinder
2015-06-15dialyzer: Modify warning for comparison of opaque typesHans Bolinder
2015-06-15dialyzer: Modify the handling of parametrized opaque typesHans Bolinder
2015-06-15Merge branch 'ia/ssl/unknown-hash/OTP-12829'Ingela Anderton Andin
2015-06-15Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
2015-06-15ssh: fix bad ssh_basic_SUITE dir_options groupHans Nilsson
2015-06-15ssh: add test case + corr for ssh_info:print/1Hans Nilsson
2015-06-15Update prim_inet.beamRaimo Niskanen
2015-06-15Merge branch 'gomoripeti/tools/cover-no-beam/OTP-12806'Björn Gustavsson
2015-06-15Merge branch 'bjorn/mnesia/doc'Björn Gustavsson
2015-06-15stdlib: Make ets:file2tab preserve read/write_concurrencySverker Eriksson
2015-06-15Merge branch 'hb/dialyzer/fix_loop/OTP-12826'Hans Bolinder
2015-06-15dialyzer: Simplify some codeHans Bolinder
2015-06-15dialyzer: Fix a bug in the expansion of formsHans Bolinder
2015-06-15Merge branch 'dgud/emacs/bifs'Dan Gudmundsson
2015-06-13Add the link to Fun expressions manual pageYoshihiro Tanaka