summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10...maint-r14Erlang/OTP2013-04-3014-756/+1585
|\
| * Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10...Micael Karlberg2013-04-181-2/+2
| |\
| | * [megaco] Used wrong downgrade tag for (flex) handlerMicael Karlberg2013-04-181-1/+1
| * | [megaco] Misc codec tickets test case fixesMicael Karlberg2013-04-176-368/+335
| * | [megaco] Misc fixes of the (internal) megaco test serverMicael Karlberg2013-04-171-31/+48
| * | Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10...Micael Karlberg2013-04-169-371/+1216
| |\ \ |/ / / | | _
| * Changed name of test case functions (from seq12263 to otp10998)Micael Karlberg2013-04-101-48/+48
| * Assign correct version and updated release notes accordingly.Micael Karlberg2013-04-104-70/+70
| * Merge branch 'bmk/megaco/flex_scanner_core/seq12263' into bmk/megaco/flex_buf...Micael Karlberg2013-04-105-59/+897
| |\
| | * Removed commentsMicael Karlberg2013-04-031-2/+0
| | * Ensure of incorrect number of terms when scanning property groupsMicael Karlberg2013-03-261-1/+3
| | * Uncommented test casesMicael Karlberg2013-03-261-20/+20
| | * Add new messagesMicael Karlberg2013-03-251-134/+134
| | * Calculation of term_spec size (initial and next) changedMicael Karlberg2013-03-251-6/+21
| | * Minor test case reworkMicael Karlberg2013-03-221-35/+27
| | * Test case cleanupMicael Karlberg2013-03-223-64/+84
| | * Add rule for test beam'esMicael Karlberg2013-03-221-0/+1
| | * Preliminary test case updatesMicael Karlberg2013-03-224-69/+879
* | | Merge branch 'maint-r13' into maint-r14Patrik Nyblom2012-08-200-0/+0
|\ \ \ | |/ /
| * | Prepare releaseErlang/OTP2012-06-132-1/+25
| * | Merge branch 'pan/heart_and_times/OTP-10111' into maint-r13Erlang/OTP2012-06-132-9/+34
| |\ \
| | * | Make heart use clock_gettime when availablePatrik Nyblom2012-06-132-9/+34
| |/ /
* | | Update release notesErlang/OTP2012-06-141-0/+46
* | | Merge branch 'rickard/no_ets_write_concurrency/OTP-10048' into maint-r14Erlang/OTP2012-06-141-12/+54
|\ \ \
| * | | Remove unnecessary memory barriers in ETS when no write_concurrency is usedRickard Green2012-04-041-12/+54
* | | | Merge branch 'pan/heart_and_times/r14/OTP-10111' into maint-r14Erlang/OTP2012-06-143-10/+35
|\ \ \ \
| * | | | Bump vsnPatrik Nyblom2012-06-141-1/+1
| * | | | Teach heart to use clock_gettime instead of times()Patrik Nyblom2012-06-142-9/+34
|/ / / /
* | | | Merge branch 'ia/R14B04_ssl_send_user_badarg_patch' into maint-r14Gustav Simonsson2012-04-116-104/+223
|\ \ \ \
| * | | | Prepare for patch releseIngela Anderton Andin2012-03-202-1/+3
| * | | | Removed function that should not be backmergedIngela Anderton Andin2012-03-201-12/+1
| * | | | Add two cherry-picked commits from R15B branch to R14B04 to provideGustav Simonsson2012-03-154-102/+162
| * | | | Mitigate Computational DoS attackIngela Anderton Andin2012-03-152-7/+75
* | | | | Merge branch 'bmk/snmp/snmp4217_integration/r14' into maint-r14Micael Karlberg2012-02-029-74/+378
|\ \ \ \ \
| * \ \ \ \ Merge branch 'maint-r13' into bmk/snmp/snmp4217_integration/r14Micael Karlberg2012-01-319-74/+378
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'bmk/snmp/snmp4174_integration/r13' into maint-r13Erlang/OTP2012-01-279-47/+389
| | |\ \ \ \
| | | * \ \ \ Merge branch 'bmk/snmp/agent/wrong_oid_for_snmpUnknownPDUHandlers2/OTP-9747/r...Micael Karlberg2012-01-274-10/+34
| | | |\ \ \ \
| | | | * | | | [snmp/agent] Add proper release notesMicael Karlberg2012-01-261-0/+54
| | | | * | | | [snmp/agent] Wrong OID used for error message replyMicael Karlberg2012-01-263-11/+39
| | | |/ / / / | | |/| | | |
| | | * | | | Merge branch 'bmk/snmp/agent/simultaneous_backup_calls/OTP-9884/r13' into bmk...Micael Karlberg2012-01-268-38/+356
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | [snmp/agent] Added backup check for local_dbMicael Karlberg2012-01-264-28/+250
| | | * | | | [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfereMicael Karlberg2012-01-255-15/+111
| | |/ / / /
* | | | | | Prepare releaseErlang/OTP2012-02-012-1/+18
* | | | | | Merge branch 'rickard/sched-compact-load/OTP-9695' into maint-r14Erlang/OTP2012-01-315-0/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add switch that can disable scheduler compaction of loadRickard Green2011-11-155-0/+35
* | | | | | Merge branch 'bmk/snmp/snmp4216_integration/r14' into maint-r14Erlang/OTP2012-01-2416-1298/+2004
|\ \ \ \ \ \
| * | | | | | [snmp] Releasse notes cleanupMicael Karlberg2012-01-242-1065/+1065
| * | | | | | [snmp] Merged from R13B and also fixed appupMicael Karlberg2012-01-2415-233/+939
| |\ \ \ \ \ \ |/ / / / / / / | | | _ / / / | | | / / /
| * | | | | Merge branch 'bmk/snmp/snmp4173_integration/r13' into maint-r13Erlang/OTP2012-01-2016-271/+1061
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'bmk/snmp/agent/update_mibs_cache_funcs/OTP-9868' into bmk/snmp/...Micael Karlberg2012-01-204-10/+23
| | |\ \ \ \ \