aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-16Merge branch 'pan/fix_jenkins_windows_maint-r15' into maint-r15Erlang/OTP
* pan/fix_jenkins_windows_maint-r15: Fix compilation of examples and tc names on windows
2012-08-16Merge branch 'pan/heart_and_times/r15/OTP-10111' into maint-r15Erlang/OTP
* pan/heart_and_times/r15/OTP-10111: Bump vsn Teach heart to use clock_gettime instead of times()
2012-06-15Fix compilation of examples and tc names on windowsPatrik Nyblom
2012-06-14Bump vsnPatrik Nyblom
2012-06-14Teach heart to use clock_gettime instead of times()Patrik Nyblom
2012-04-25Update release notesErlang/OTP
2012-04-25Merge branch 'lars/xmerl/cont-error-default-decl/OTP-10063' into maint-r15Erlang/OTP
* lars/xmerl/cont-error-default-decl/OTP-10063: Fix continuation bug in parse_default_decl_1/2
2012-04-25Prepare releaseSverker Eriksson
2012-04-25Merge branch 'rickard/driver_system_info/OTP-10059' into maint-r15Erlang/OTP
* rickard/driver_system_info/OTP-10059: Clear number of async threads if no thread support
2012-04-25Merge branch 'rickard/no_ets_write_concurrency-r15b01/OTP-10048' into maint-r15Erlang/OTP
* rickard/no_ets_write_concurrency-r15b01/OTP-10048: Remove unnecessary memory barriers in ETS when no write_concurrency is used
2012-04-25Merge branch 'rickard/sched-busy-wait/OTP-10044' into maint-r15Erlang/OTP
* rickard/sched-busy-wait/OTP-10044: Add switch controlling scheduler busy wait Conflicts: erts/emulator/beam/erl_process.c erts/emulator/beam/erl_process.h
2012-04-25Merge branch 'rickard/sched-wakeup-other-r15b01/OTP-10033' into maint-r15Erlang/OTP
* rickard/sched-wakeup-other-r15b01/OTP-10033: Implement proposal for new scheduler wakeup strategy
2012-04-23Merge branch 'rickard/sched-wakeup-other/OTP-10033' into ↵Rickard Green
rickard/sched-wakeup-other-r15b01/OTP-10033 Conflicts: erts/emulator/beam/erl_process.c erts/vsn.mk
2012-04-23Add switch controlling scheduler busy waitRickard Green
2012-04-23Implement proposal for new scheduler wakeup strategyRickard Green
2012-04-23Fix continuation bug in parse_default_decl_1/2Lars Thorsen
2012-04-18Clear number of async threads if no thread supportRickard Green
2012-04-11Merge branch 'maint-r14' into maint-r15Gustav Simonsson
2012-04-11Merge branch 'ia/R14B04_ssl_send_user_badarg_patch' into maint-r14Gustav Simonsson
2012-04-04Merge branch 'rickard/no_ets_write_concurrency/OTP-10048' into ↵Rickard Green
rickard/no_ets_write_concurrency-r15b01/OTP-10048 Conflicts: erts/emulator/beam/erl_db_hash.c
2012-04-04Remove unnecessary memory barriers in ETS when no write_concurrency is usedRickard Green
2012-04-01Prepare releaseOTP_R15B01Erlang/OTP
2012-03-30Merge branch 'peppe/common_test/otp-10039' into maintPeter Andersson
* peppe/common_test/otp-10039: Document the new timetrap interface
2012-03-30Document the new timetrap interfacePeter Andersson
OTP-10039
2012-03-30Merge branch 'sverk/proc-race-leak/OTP-10041' into maintSverker Eriksson
* sverk/proc-race-leak/OTP-10041: erts: Fix memory leak caused by race on exiting process
2012-03-30Merge branch 'rickard/erts-poll/OTP-10019' into maintRickard Green
* rickard/erts-poll/OTP-10019: Fix wakeup functionality in no thread support case OTP-10036 is completely unrelated to this commit. Only here to trigger info about the OTP-10036 ticket in the release notes script... OTP-10036
2012-03-30erts: Fix memory leak caused by race on exiting processSverker Eriksson
Seen with valgrind running ets_SUITE:delete_large_tab or delete_large_named_table.
2012-03-30Update primary bootstrapBjörn-Egil Dahlberg
2012-03-30Update copyright yearsBjörn-Egil Dahlberg
2012-03-30Merge branch 'gustav/sasl/release-handler-test-fix-temp' into maintGustav Simonsson
* gustav/sasl/release-handler-test-fix-temp: Moved test case to avoid a conflict between test cases. Temporarily fix for R15B01.
2012-03-30Merge branch 'siri/crashdump_viewer/create_r14b_dump/OTP-10032' into maintSiri Hansen
* siri/crashdump_viewer/create_r14b_dump/OTP-10032: [crashdump_viewer] Add case clause for testing with dump from R14B
2012-03-30[crashdump_viewer] Add case clause for testing with dump from R14BSiri Hansen
2012-03-30Merge branch 'siri/reltool/dialyzer/OTP-10035' into maintSiri Hansen
* siri/reltool/dialyzer/OTP-10035: [reltool] Fix dialyzer warnings for R15B01
2012-03-30Merge branch 'ta/docs-maint' into maintGustav Simonsson
* ta/docs-maint: Fix typos in ct getting_started_chapter.xml Fix typos in driver.xml and erl_driver.xml Fix typos in INSTALL-WIN32.md OTP-10037
2012-03-30[eldap] Fix docsDan Gudmundsson
Fix copy paste errors
2012-03-30Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maintDan Gudmundsson
* dgud/wx/misc-improvements/OTP-9947: [wx] Fix list in list in list specs
2012-03-29Merge branch 'kenneth/asn1/integer_range/OTP-9946' into maintKenneth Lundin
* kenneth/asn1/integer_range/OTP-9946: replace 5 sec timeout (too short) with monitor in asn1_db requests Correct handling of INTEGER (1..4 | 8 | 10 | 20)
2012-03-29replace 5 sec timeout (too short) with monitor in asn1_db requestsKenneth Lundin
This bug was introduced as part of the parallelization of test suites and is notpart of any released version
2012-03-29[eldap] Fix docDan Gudmundsson
Functions may not start with space, references do not work.
2012-03-29[reltool] Fix dialyzer warnings for R15B01Siri Hansen
Records #mod{} and #app{} are used in ets:select and must therefore have '$1', '$2' and '_' as possible value of fields.
2012-03-29[wx] Fix list in list in list specsDan Gudmundsson
To many lists
2012-03-29Merge branch 'lars/orber/ssl-opts-documentation/OTP-9966' into maintLars Thorsen
* lars/orber/ssl-opts-documentation/OTP-9966: Fix descriptions of ssl_client_options and ssl_server_options
2012-03-29Fix descriptions of ssl_client_options and ssl_server_optionsLars Thorsen
2012-03-29Merge branch 'dgud/eldap' into maintDan Gudmundsson
* dgud/eldap: [eldap] Fix parse_port error handling [eldap] Add rudimentary docs [eldap] Add asn.1 compilation options [eldap] Add dereference options in search [eldap] Remove broken functionality [eldap] Add infrastructure [eldap] Initial copy of Tobbe's eldap client OTP-10034
2012-03-29Merge branch 'peppe/common_test/otp-10029' into maintPeter Andersson
* peppe/common_test/otp-10029: Update documentation OTP-9972
2012-03-29Update documentationPeter Andersson
OTP-9972 OTP-9659 OTP-9855 OTP-9880 OTP-9973 OTP-9986 OTP-9992 OTP-9935
2012-03-28Moved test case to avoid a conflict between test cases.Gustav Simonsson
This is a temporarily fix for R15B01.
2012-03-28Merge branch 'lukas/system/skip_fenris_max_threads' into maintBjörn-Egil Dahlberg
* lukas/system/skip_fenris_max_threads: Skip on buggy solaris
2012-03-28INSTALL.md: Update information about MacOS XBjörn Gustavsson
* Bump version number of Lion. * We no longer run tests on Tiger. * Mark the information about building universal binaries as obsolete.
2012-03-28Merge branch 'ia/ssl/dialyzer-specs' into maintIngela Anderton Andin
* ia/ssl/dialyzer-specs: Corrected dialyzer specs and exported some dialyzer specs