aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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
2012-01-19[snmp/agent] Incorrect mib server cache gclimit updateMicael Karlberg
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
2012-01-17Merge branch 'bmk/inets/inets573_integration' into maint-r14Erlang/OTP
* bmk/inets/inets573_integration: [inets/httpc] The client incorrectly streams 404 responses [inets/httpc] Add proper code change code [inets/httpc] Add test case [inets] Add proper release notes for OTP-9847 [inets/httpc] Fix the selection of session for keep-alive mode When selecting a session, the "state" of the session (specifically if the server has responded) was not taken into account. Attempting to fix this, a "state" field (actually available) has been added to the session record. [ftp] Fails to open IPv6 connection
2012-01-16Merge branch 'bmk/snmp/snmp4215_integration/r14' into maint-r14Erlang/OTP
* bmk/snmp/snmp4215_integration/r14: [snmp] Fixed release notes. Used wrong ticket number [snmp/agent] Updated appup file [snmp/agent] Updated release notes [snmp/agent] Removed the (unused) serializer part [snmp/agent] Use unique temporary file name during vacm table dumnping [snmp/agent] Add common timestamp format function. [snmp/agent] Synchronization feature added [snmp/agent] Creating a unique temporary file whe dumping vacm [snmp/agent] Changed version [snmp/agent] Found another old-style fun (2-tuple) [snmp/agent] Removed use of old style tuple funs
2012-01-16[snmp] Fixed release notes. Used wrong ticket numberMicael Karlberg
OTP-9783
2012-01-13Merge branch 'bmk/inets/httpc/streaming_404/r14/OTP-9860' into ↵Micael Karlberg
bmk/inets/inets573_integration Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
2012-01-13[inets/httpc] The client incorrectly streams 404 responsesMicael Karlberg
The client incorrectly streams 404 responses. The documentation specifies that only 200 and 206 responses shall be streamed. OTP-9860
2012-01-12Merge branch 'bmk/snmp/agent/synchronizing_vacm_dumping/r14/OTP-9851' into ↵Micael Karlberg
bmk/snmp/snmp4215_integration/r14 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
2012-01-12[snmp/agent] Updated appup fileMicael Karlberg
2012-01-12[snmp/agent] Updated release notesMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Removed the (unused) serializer partMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Use unique temporary file name during vacm table dumnpingMicael Karlberg
Removed the use synchronization mechanism during vacm table dumping. This could not be placed in the master agent since it was sometimes used from the master agent. Also is was credated and used from the top agent supervisor, befor the master agent process was created... OTP-9851
2012-01-12[snmp/agent] Add common timestamp format function.Micael Karlberg
OTP-9851
2012-01-12[snmp/agent] Synchronization feature addedMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Creating a unique temporary file whe dumping vacmMicael Karlberg
Attempting to create a unique temporary file when dumping the vacm table to disk. OTP-9851
2012-01-05Merge branch 'bmk/snmp/agent/remove_use_of_old_style_fun/r14/OTP-9783' into ↵Micael Karlberg
bmk/snmp/snmp4215_integration/r14
2012-01-05[snmp/agent] Changed versionMicael Karlberg
Assigned new version, 4.21.5 instedad of 4.22, for app. This version is more in line with the change. Updated release notes and appup accordingly. OTP-9783
2012-01-05[snmp/agent] Found another old-style fun (2-tuple)Micael Karlberg
OTP-9783
2012-01-05[snmp/agent] Removed use of old style tuple funsMicael Karlberg
OTP-9783
2012-01-05Merge branch 'bmk/inets/httpc/bad_keep_alive_mode/r14/OTP-9847' into ↵Micael Karlberg
bmk/inets/inets573_integration Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
2012-01-05Merge branch 'bmk/inets/ftp/bad_ipv6_formatting_in_eprt/r14/OTP-9827' into ↵Micael Karlberg
bmk/inets/inets573_integration
2012-01-05[inets/httpc] Add proper code change codeMicael Karlberg
Added proper code to handle code upgrade/downgrade. The manager and handler(s) are interdependant which makes it a bit tricky. OTP-9847
2012-01-04[inets/httpc] Add test caseMicael Karlberg
Add a test case verifying the session selection. Add some more use of the update_session function. Improved verbosity printouts. OTP-9847
2012-01-03[inets] Add proper release notes for OTP-9847Micael Karlberg
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 07:26:53 +0000