aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-04-30Merge branch ↵maint-r14Erlang/OTP
'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14' into maint-r14 * bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14: [megaco] Used wrong downgrade tag for (flex) handler [megaco] Misc codec tickets test case fixes [megaco] Misc fixes of the (internal) megaco test server Changed name of test case functions (from seq12263 to otp10998) Assign correct version and updated release notes accordingly. Removed comments Ensure of incorrect number of terms when scanning property groups Uncommented test cases Add new messages Calculation of term_spec size (initial and next) changed Minor test case rework Test case cleanup Add rule for test beam'es Preliminary test case updates
2013-04-18Merge branch ↵Micael Karlberg
'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14 Fixed flex handler code-change version tag.
2013-04-18[megaco] Used wrong downgrade tag for (flex) handlerMicael Karlberg
2013-04-17[megaco] Misc codec tickets test case fixesMicael Karlberg
2013-04-17[megaco] Misc fixes of the (internal) megaco test serverMicael Karlberg
2013-04-16Merge branch ↵Micael Karlberg
'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14 Conflicts: lib/megaco/doc/src/notes.xml lib/megaco/src/app/megaco.appup.src lib/megaco/test/megaco_codec_flex_lib.erl lib/megaco/test/megaco_codec_v2_test.erl lib/megaco/test/megaco_test_lib.erl lib/megaco/vsn.mk
2013-04-10Changed name of test case functions (from seq12263 to otp10998)Micael Karlberg
2013-04-10Assign correct version and updated release notes accordingly.Micael Karlberg
Also added (and cleaned up) appup.
2013-04-10Merge branch 'bmk/megaco/flex_scanner_core/seq12263' into ↵Micael Karlberg
bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13 Conflicts: lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
2013-04-03Removed commentsMicael Karlberg
2013-03-26Ensure of incorrect number of terms when scanning property groupsMicael Karlberg
At the end of the mfs_load_property_groups function, the final property group list and property groups list is "terminated". A call to mfs_ensure_term_spec with (incorrect) size 4 was made prior to this to ensure enough data was available. The correct size was 6!
2013-03-26Uncommented test casesMicael Karlberg
2013-03-25Add new messagesMicael Karlberg
2013-03-25Calculation of term_spec size (initial and next) changedMicael Karlberg
There seem to be some problem with realloc (core dump) so the calculation of the term_spec size needs to be "corrected".
2013-03-22Minor test case reworkMicael Karlberg
2013-03-22Test case cleanupMicael Karlberg
2013-03-22Add rule for test beam'esMicael Karlberg
2013-03-22Preliminary test case updatesMicael Karlberg
2012-08-20Merge branch 'maint-r13' into maint-r14Patrik Nyblom
2012-06-14Update release notesErlang/OTP
2012-06-14Merge branch 'rickard/no_ets_write_concurrency/OTP-10048' into maint-r14Erlang/OTP
* rickard/no_ets_write_concurrency/OTP-10048: Remove unnecessary memory barriers in ETS when no write_concurrency is used
2012-06-14Merge branch 'pan/heart_and_times/r14/OTP-10111' into maint-r14Erlang/OTP
* pan/heart_and_times/r14/OTP-10111: Bump vsn Teach heart to use clock_gettime instead of times()
2012-06-14Bump vsnPatrik Nyblom
2012-06-14Teach heart to use clock_gettime instead of times()Patrik Nyblom
2012-06-13Prepare releaseErlang/OTP
2012-06-13Merge branch 'pan/heart_and_times/OTP-10111' into maint-r13Erlang/OTP
* pan/heart_and_times/OTP-10111: Make heart use clock_gettime when available
2012-06-13Make heart use clock_gettime when availablePatrik Nyblom
2012-04-11Merge branch 'ia/R14B04_ssl_send_user_badarg_patch' into maint-r14Gustav Simonsson
2012-04-04Remove unnecessary memory barriers in ETS when no write_concurrency is usedRickard Green
2012-03-20Prepare for patch releseIngela Anderton Andin
Four digit version number as we backmerged part of R15 solutions
2012-03-20Removed function that should not be backmergedIngela Anderton Andin
2012-03-15Add two cherry-picked commits from R15B branch to R14B04 to provideGustav Simonsson
patch for a ssl_connection bug which was fixed in R15B but exists in R14B04. See Sequence 12016 * Send ssl_closed notification to active ssl user when a tcp error occurs
2012-03-15Mitigate Computational DoS attackIngela Anderton Andin
2012-02-02Merge branch 'bmk/snmp/snmp4217_integration/r14' into maint-r14Micael Karlberg
* bmk/snmp/snmp4217_integration/r14: [snmp/agent] Add proper release notes [snmp/agent] Wrong OID used for error message reply [snmp/agent] Added backup check for local_db [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere
2012-02-01Prepare releaseErlang/OTP
2012-01-31Merge branch 'rickard/sched-compact-load/OTP-9695' into maint-r14Erlang/OTP
* rickard/sched-compact-load/OTP-9695: Add switch that can disable scheduler compaction of load
2012-01-31Merge branch 'maint-r13' into bmk/snmp/snmp4217_integration/r14Micael Karlberg
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/doc/src/snmpa.xml lib/snmp/src/agent/snmpa_mpd.erl lib/snmp/src/app/snmp.appup.src lib/snmp/test/snmp_agent_test.erl lib/snmp/vsn.mk
2012-01-27Merge branch 'bmk/snmp/snmp4174_integration/r13' into maint-r13Erlang/OTP
* bmk/snmp/snmp4174_integration/r13: [snmp/agent] Add proper release notes [snmp/agent] Wrong OID used for error message reply [snmp/agent] Added backup check for local_db [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere
2012-01-27Merge branch ↵Micael Karlberg
'bmk/snmp/agent/wrong_oid_for_snmpUnknownPDUHandlers2/OTP-9747/r13' into bmk/snmp/snmp4174_integration/r13 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2012-01-26Merge branch 'bmk/snmp/agent/simultaneous_backup_calls/OTP-9884/r13' into ↵Micael Karlberg
bmk/snmp/snmp4174_integration/r13
2012-01-26[snmp/agent] Add proper release notesMicael Karlberg
OTP-9884
2012-01-26[snmp/agent] Wrong OID used for error message replyMicael Karlberg
When sending an error message (reply) regarding snmpUnknownPDUHandlers, the agent used the wrong OID. OTP-9747
2012-01-26[snmp/agent] Added backup check for local_dbMicael Karlberg
Added a backup check also for local_db (same as for the mib-server). Updated appup and set proper version (vsn.mk). Finally added test case for issue. OTP-9884
2012-01-25[snmp/agent] Simultaneous snmpa:backup/1,2 calls interfereMicael Karlberg
Simultaneous snmpa#backup">snmpa:backup/1,2 calls interfere. The master agent did not check if a backup was already in progress when a backup request was accepted OTP-9884
2012-01-24Merge branch 'bmk/snmp/snmp4216_integration/r14' into maint-r14Erlang/OTP
* bmk/snmp/snmp4216_integration/r14: [snmp] Releasse notes cleanup [snmp/agent] Incorrect mib server cache gclimit update [snmp] Updated doc and fixed wrequest create macros [snmp] Be more verbose in the worker procs [snmp] Add a more informative return value when the trap sending fails [snmp] Fixed the mt_trap test-case [snmp] Maximum number of varbinds in a Get-BULK response [snmp] Correted the expect bug in the snmp test utility [snmp] Mostly added some more verbosity stuff
2012-01-24[snmp] Releasse notes cleanupMicael Karlberg
2012-01-24[snmp] Merged from R13B and also fixed appupMicael Karlberg
Merge from R13B maintenance branch (snmp-4.17.3), fixed appup and source diff (there is some between snmp-4.17.3 and 4.21.6). Merge branch 'maint-r13' into bmk/snmp/snmp4216_integration/r14 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/agent/snmpa.erl lib/snmp/src/agent/snmpa_agent.erl lib/snmp/src/agent/snmpa_trap.erl lib/snmp/src/app/snmp.appup.src lib/snmp/test/snmp_agent_test.erl lib/snmp/vsn.mk
2012-01-20Merge branch 'bmk/snmp/snmp4173_integration/r13' into maint-r13Erlang/OTP
* bmk/snmp/snmp4173_integration/r13: [snmp/agent] Incorrect mib server cache gclimit update [snmp] Updated doc and fixed wrequest create macros [snmp] Be more verbose in the worker procs [snmp] Add a more informative return value when the trap sending fails [snmp] Fixed the mt_trap test-case [snmp] Maximum number of varbinds in a Get-BULK response [snmp] Correted the expect bug in the snmp test utility [snmp] Mostly added some more verbosity stuff
2012-01-20Merge branch 'bmk/snmp/agent/update_mibs_cache_funcs/OTP-9868' into ↵Micael Karlberg
bmk/snmp/snmp4173_integration/r13 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2012-01-20Merge branch 'bmk/snmp/agent/get_bulk_with_large_max_reps/OTP-9700' into ↵Micael Karlberg
bmk/snmp/snmp4173_integration/r13