Age | Commit message (Collapse) | Author |
|
'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.
|
|
|
|
|
|
|
|
'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
|
|
|
|
Also added (and cleaned up) appup.
|
|
bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13
Conflicts:
lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
|
|
|
|
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!
|
|
|
|
|
|
There seem to be some problem with realloc (core dump)
so the calculation of the term_spec size needs to be
"corrected".
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* rickard/no_ets_write_concurrency/OTP-10048:
Remove unnecessary memory barriers in ETS when no write_concurrency is used
|
|
* pan/heart_and_times/r14/OTP-10111:
Bump vsn
Teach heart to use clock_gettime instead of times()
|
|
|
|
|
|
|
|
* pan/heart_and_times/OTP-10111:
Make heart use clock_gettime when available
|
|
|
|
|
|
|
|
Four digit version number as we backmerged part of R15 solutions
|
|
|
|
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
|
|
|
|
* 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
|
|
|
|
* rickard/sched-compact-load/OTP-9695:
Add switch that can disable scheduler compaction of load
|
|
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
|
|
* 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
|
|
'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
|
|
bmk/snmp/snmp4174_integration/r13
|
|
OTP-9884
|
|
When sending an error message (reply) regarding
snmpUnknownPDUHandlers, the agent used the wrong OID.
OTP-9747
|
|
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
|
|
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
|
|
* 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
|
|
|
|
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
|
|
* 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
|
|
bmk/snmp/snmp4173_integration/r13
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
lib/snmp/vsn.mk
|
|
bmk/snmp/snmp4173_integration/r13
|
|
Mib server cache gclimit update function incorrectly calls
age update function. The gclimit update function update_mibs_cache_gclimit/1
incorrectly called update_mibs_cache_age/2 update function.
OTP-9868
|