Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10...maint-r14 | Erlang/OTP | 2013-04-30 | 14 | -756/+1585 |
|\ | |||||
| * | Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10... | Micael Karlberg | 2013-04-18 | 1 | -2/+2 |
| |\ | |||||
| | * | [megaco] Used wrong downgrade tag for (flex) handler | Micael Karlberg | 2013-04-18 | 1 | -1/+1 |
| * | | [megaco] Misc codec tickets test case fixes | Micael Karlberg | 2013-04-17 | 6 | -368/+335 |
| * | | [megaco] Misc fixes of the (internal) megaco test server | Micael Karlberg | 2013-04-17 | 1 | -31/+48 |
| * | | Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10... | Micael Karlberg | 2013-04-16 | 9 | -371/+1216 |
| |\ \ |/ / / | | _ | |||||
| * | Changed name of test case functions (from seq12263 to otp10998) | Micael Karlberg | 2013-04-10 | 1 | -48/+48 |
| * | Assign correct version and updated release notes accordingly. | Micael Karlberg | 2013-04-10 | 4 | -70/+70 |
| * | Merge branch 'bmk/megaco/flex_scanner_core/seq12263' into bmk/megaco/flex_buf... | Micael Karlberg | 2013-04-10 | 5 | -59/+897 |
| |\ | |||||
| | * | Removed comments | Micael Karlberg | 2013-04-03 | 1 | -2/+0 |
| | * | Ensure of incorrect number of terms when scanning property groups | Micael Karlberg | 2013-03-26 | 1 | -1/+3 |
| | * | Uncommented test cases | Micael Karlberg | 2013-03-26 | 1 | -20/+20 |
| | * | Add new messages | Micael Karlberg | 2013-03-25 | 1 | -134/+134 |
| | * | Calculation of term_spec size (initial and next) changed | Micael Karlberg | 2013-03-25 | 1 | -6/+21 |
| | * | Minor test case rework | Micael Karlberg | 2013-03-22 | 1 | -35/+27 |
| | * | Test case cleanup | Micael Karlberg | 2013-03-22 | 3 | -64/+84 |
| | * | Add rule for test beam'es | Micael Karlberg | 2013-03-22 | 1 | -0/+1 |
| | * | Preliminary test case updates | Micael Karlberg | 2013-03-22 | 4 | -69/+879 |
* | | | Merge branch 'maint-r13' into maint-r14 | Patrik Nyblom | 2012-08-20 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Prepare release | Erlang/OTP | 2012-06-13 | 2 | -1/+25 |
| * | | Merge branch 'pan/heart_and_times/OTP-10111' into maint-r13 | Erlang/OTP | 2012-06-13 | 2 | -9/+34 |
| |\ \ | |||||
| | * | | Make heart use clock_gettime when available | Patrik Nyblom | 2012-06-13 | 2 | -9/+34 |
| |/ / | |||||
* | | | Update release notes | Erlang/OTP | 2012-06-14 | 1 | -0/+46 |
* | | | Merge branch 'rickard/no_ets_write_concurrency/OTP-10048' into maint-r14 | Erlang/OTP | 2012-06-14 | 1 | -12/+54 |
|\ \ \ | |||||
| * | | | Remove unnecessary memory barriers in ETS when no write_concurrency is used | Rickard Green | 2012-04-04 | 1 | -12/+54 |
* | | | | Merge branch 'pan/heart_and_times/r14/OTP-10111' into maint-r14 | Erlang/OTP | 2012-06-14 | 3 | -10/+35 |
|\ \ \ \ | |||||
| * | | | | Bump vsn | Patrik Nyblom | 2012-06-14 | 1 | -1/+1 |
| * | | | | Teach heart to use clock_gettime instead of times() | Patrik Nyblom | 2012-06-14 | 2 | -9/+34 |
|/ / / / | |||||
* | | | | Merge branch 'ia/R14B04_ssl_send_user_badarg_patch' into maint-r14 | Gustav Simonsson | 2012-04-11 | 6 | -104/+223 |
|\ \ \ \ | |||||
| * | | | | Prepare for patch relese | Ingela Anderton Andin | 2012-03-20 | 2 | -1/+3 |
| * | | | | Removed function that should not be backmerged | Ingela Anderton Andin | 2012-03-20 | 1 | -12/+1 |
| * | | | | Add two cherry-picked commits from R15B branch to R14B04 to provide | Gustav Simonsson | 2012-03-15 | 4 | -102/+162 |
| * | | | | Mitigate Computational DoS attack | Ingela Anderton Andin | 2012-03-15 | 2 | -7/+75 |
* | | | | | Merge branch 'bmk/snmp/snmp4217_integration/r14' into maint-r14 | Micael Karlberg | 2012-02-02 | 9 | -74/+378 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'maint-r13' into bmk/snmp/snmp4217_integration/r14 | Micael Karlberg | 2012-01-31 | 9 | -74/+378 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch 'bmk/snmp/snmp4174_integration/r13' into maint-r13 | Erlang/OTP | 2012-01-27 | 9 | -47/+389 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'bmk/snmp/agent/wrong_oid_for_snmpUnknownPDUHandlers2/OTP-9747/r... | Micael Karlberg | 2012-01-27 | 4 | -10/+34 |
| | | |\ \ \ \ | |||||
| | | | * | | | | [snmp/agent] Add proper release notes | Micael Karlberg | 2012-01-26 | 1 | -0/+54 |
| | | | * | | | | [snmp/agent] Wrong OID used for error message reply | Micael Karlberg | 2012-01-26 | 3 | -11/+39 |
| | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Merge branch 'bmk/snmp/agent/simultaneous_backup_calls/OTP-9884/r13' into bmk... | Micael Karlberg | 2012-01-26 | 8 | -38/+356 |
| | | |\ \ \ \ | | |/ / / / / | |||||
| | | * | | | | [snmp/agent] Added backup check for local_db | Micael Karlberg | 2012-01-26 | 4 | -28/+250 |
| | | * | | | | [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere | Micael Karlberg | 2012-01-25 | 5 | -15/+111 |
| | |/ / / / | |||||
* | | | | | | Prepare release | Erlang/OTP | 2012-02-01 | 2 | -1/+18 |
* | | | | | | Merge branch 'rickard/sched-compact-load/OTP-9695' into maint-r14 | Erlang/OTP | 2012-01-31 | 5 | -0/+35 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add switch that can disable scheduler compaction of load | Rickard Green | 2011-11-15 | 5 | -0/+35 |
* | | | | | | Merge branch 'bmk/snmp/snmp4216_integration/r14' into maint-r14 | Erlang/OTP | 2012-01-24 | 16 | -1298/+2004 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [snmp] Releasse notes cleanup | Micael Karlberg | 2012-01-24 | 2 | -1065/+1065 |
| * | | | | | | [snmp] Merged from R13B and also fixed appup | Micael Karlberg | 2012-01-24 | 15 | -233/+939 |
| |\ \ \ \ \ \ |/ / / / / / / | | | _ / / / | | | / / / | |||||
| * | | | | | Merge branch 'bmk/snmp/snmp4173_integration/r13' into maint-r13 | Erlang/OTP | 2012-01-20 | 16 | -271/+1061 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'bmk/snmp/agent/update_mibs_cache_funcs/OTP-9868' into bmk/snmp/... | Micael Karlberg | 2012-01-20 | 4 | -10/+23 |
| | |\ \ \ \ \ |