summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵maint-r14Erlang/OTP2013-04-3014-756/+1585
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * Merge branch ↵Micael Karlberg2013-04-181-2/+2
| |\ | | | | | | | | | | | | | | | '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.
| | * [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 ↵Micael Karlberg2013-04-169-371/+1216
| |\ \ |/ / / | | _ | | | | | | | | | | | | | | | | | | '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
| * 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
| | | | | | | | Also added (and cleaned up) appup.
| * Merge branch 'bmk/megaco/flex_scanner_core/seq12263' into ↵Micael Karlberg2013-04-105-59/+897
| |\ | | | | | | | | | | | | | | | | | | bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13 Conflicts: lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
| | * Removed commentsMicael Karlberg2013-04-031-2/+0
| | |
| | * Ensure of incorrect number of terms when scanning property groupsMicael Karlberg2013-03-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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!
| | * 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
| | | | | | | | | | | | | | | | | | There seem to be some problem with realloc (core dump) so the calculation of the term_spec size needs to be "corrected".
| | * 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
| |\ \ | | | | | | | | | | | | | | | | * pan/heart_and_times/OTP-10111: Make heart use clock_gettime when available
| | * | 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
|\ \ \ | | | | | | | | | | | | | | | | * rickard/no_ets_write_concurrency/OTP-10048: Remove unnecessary memory barriers in ETS when no write_concurrency is used
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * pan/heart_and_times/r14/OTP-10111: Bump vsn Teach heart to use clock_gettime instead of times()
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Four digit version number as we backmerged part of R15 solutions
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * \ \ \ \ Merge branch 'maint-r13' into bmk/snmp/snmp4217_integration/r14Micael Karlberg2012-01-319-74/+378
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Merge branch 'bmk/snmp/snmp4174_integration/r13' into maint-r13Erlang/OTP2012-01-279-47/+389
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * \ \ \ Merge branch ↵Micael Karlberg2012-01-274-10/+34
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| | | | * | | | [snmp/agent] Add proper release notesMicael Karlberg2012-01-261-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-9884
| | | | * | | | [snmp/agent] Wrong OID used for error message replyMicael Karlberg2012-01-263-11/+39
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sending an error message (reply) regarding snmpUnknownPDUHandlers, the agent used the wrong OID. OTP-9747
| | | * | | | Merge branch 'bmk/snmp/agent/simultaneous_backup_calls/OTP-9884/r13' into ↵Micael Karlberg2012-01-268-38/+356
| | | |\ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | bmk/snmp/snmp4174_integration/r13
| | | * | | | [snmp/agent] Added backup check for local_dbMicael Karlberg2012-01-264-28/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfereMicael Karlberg2012-01-255-15/+111
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Prepare releaseErlang/OTP2012-02-012-1/+18
| | | | | |
* | | | | | Merge branch 'rickard/sched-compact-load/OTP-9695' into maint-r14Erlang/OTP2012-01-315-0/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * rickard/sched-compact-load/OTP-9695: Add switch that can disable scheduler compaction of load
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | [snmp] Releasse notes cleanupMicael Karlberg2012-01-242-1065/+1065
| | | | | | |
| * | | | | | [snmp] Merged from R13B and also fixed appupMicael Karlberg2012-01-2415-233/+939
| |\ \ \ \ \ \ |/ / / / / / / | | | _ / / / | | | / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge branch 'bmk/snmp/snmp4173_integration/r13' into maint-r13Erlang/OTP2012-01-2016-271/+1061
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * \ \ \ \ Merge branch 'bmk/snmp/agent/update_mibs_cache_funcs/OTP-9868' into ↵Micael Karlberg2012-01-204-10/+23
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bmk/snmp/snmp4173_integration/r13 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
View Lorry Controller Status