summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [erl_docgen] Fix pdf indentation bug for tagged listsLars Thorsen2013-01-211-5/+7
* Merge branch 'bmk/snmp/snmp423_integration'Micael Karlberg2013-01-215-662/+107
|\
| * Merge branch 'bmk/snmp/manager/performance_improvement/OTP-10673' into bmk/sn...Micael Karlberg2013-01-142-19/+24
| |\
| | * [snmp/manager] Updated appupMicael Karlberg2013-01-111-572/+2
| | * [snmp/manager] Updated release notesMicael Karlberg2013-01-111-65/+65
| | * [snmp/manager] Proper copyright end year (2013)Micael Karlberg2013-01-111-1/+1
| | * Merge branch 'id/snmp_optimization' into bmk/snmp/manager/performance_improve...Micael Karlberg2013-01-111-18/+17
| | |\
| | | * SNMP performance optimizationIvan Dubovik2012-11-171-18/+17
| * | | Merge branch 'bmk/snmp/remove_tuple_fun/OTP-10672' into bmk/snmp/snmp423_inte...Micael Karlberg2013-01-112-3/+10
| |\ \ \
| | * | | [snmp] Updated release notesMicael Karlberg2013-01-091-65/+68
| | * | | [snmp/agent] Proper copyright end year (2013)Micael Karlberg2013-01-091-1/+1
| | * | | [snmp/agent] Updated appup fileMicael Karlberg2013-01-091-572/+1
| | * | | Merge branch 'lf/snmp-tuple-fun' into bmk/snmp/remove_tuple_fun/OTP-10672Micael Karlberg2013-01-091-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Remove runtime warning in snmpa_agent because of tuple fun usageLuca Favatella2012-10-261-2/+2
| * | | | Merge branch 'bmk/snmp/snmp_user_default_return_values/OTP-10671' into bmk/sn...Micael Karlberg2013-01-113-640/+73
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [snmp/manager] Updated appupMicael Karlberg2013-01-091-572/+2
| | * | | [snmp/manager] Updated release notesMicael Karlberg2013-01-091-65/+68
| | * | | [snmp/manager] Proper copyright end year (2013)Micael Karlberg2013-01-091-1/+1
| | * | | Polish return values of snmpm_user_default according to snmpm_user docLuca Favatella2013-01-091-2/+2
| |/ / /
* | | | Merge branch 'fredrik/ssh/ssh-internal-error/OTP-10731'Fredrik Gustafsson2013-01-211-5/+9
|\ \ \ \
| * | | | Fixed internal error on when client and server can not agree o which authmeth...Fredrik Gustafsson2013-01-181-5/+9
* | | | | Merge branch 'fredrik/ssh/port_in_use_error'Fredrik Gustafsson2013-01-211-1/+3
|\ \ \ \ \
| * | | | | Fixed bug which lead to crash in startup of daemon, if port was in useFredrik Gustafsson2013-01-181-1/+3
* | | | | | Merge branch 'ia/ssl/simplify-addition-of-keyexchange-algorithms/OTP-10709'Ingela Anderton Andin2013-01-213-148/+161
|\ \ \ \ \ \
| * | | | | | SSL: simplify server key encoding, decoding and signature handlingAndreas Schultz2013-01-173-105/+133
| * | | | | | SSL: unify the different implementations signature check implementationsAndreas Schultz2013-01-172-43/+28
* | | | | | | Merge branch 'anders/diameter/length_error/OTP-10693'Anders Svensson2013-01-212-35/+186
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | More testcases in traffic suiteAnders Svensson2013-01-181-6/+107
| * | | | | | Test diameter_packet answersAnders Svensson2013-01-181-26/+69
| * | | | | | Ensure correct setting of 3xxx result codeAnders Svensson2013-01-181-3/+10
* | | | | | | Merge branch 'nox/enable-silent-rules/OTP-10726'Björn-Egil Dahlberg2013-01-18102-730/+915
|\ \ \ \ \ \ \
| * | | | | | | Implement ./otp_build configure --enable-silent-rulesAnthony Ramine2013-01-15102-730/+915
* | | | | | | | Merge branch 'egil/fix-LM_TRY_ENABLE_CFLAG'Björn-Egil Dahlberg2013-01-187-29/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix LM_TRY_ENABLE_CFLAG to use correct environmentBjörn-Egil Dahlberg2013-01-157-29/+23
* | | | | | | | | Update primary bootstrapBjörn Gustavsson2013-01-1850-1/+0
* | | | | | | | | Merge branch 'bjorn/kernel/undefined-function-handler/OTP-10617'Björn Gustavsson2013-01-184-41/+119
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Teach error_handler to call '$handle_undefined_function'Björn Gustavsson2013-01-144-41/+119
* | | | | | | | | | Merge branch 'bjorn/remove-parameterized-modules/OTP-10616'Björn Gustavsson2013-01-1816-951/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove support for parameterized modulesBjörn Gustavsson2013-01-1810-799/+21
| * | | | | | | | | | xref_SUITE: Don't test parameterized modulesBjörn Gustavsson2013-01-101-60/+2
| * | | | | | | | | | shell_SUITE: Don't test parameterized modulesBjörn Gustavsson2013-01-101-15/+2
| * | | | | | | | | | erl_expand_records_SUITE: Don't test parameterized modulesBjörn Gustavsson2013-01-101-30/+3
| * | | | | | | | | | erl_eval: Don't test parameterized modulesBjörn Gustavsson2013-01-103-47/+0
* | | | | | | | | | | Merge branch 'nox/compiler/forbid-locals-in-core-guards/OTP-10706'Fredrik Gustafsson2013-01-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Forbid local fun variables in Core Erlang guardsAnthony Ramine2013-01-161-1/+2
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nox/rm-reverse-eta-conversion/OTP-10682'Fredrik Gustafsson2013-01-184-28/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't use fun references in cprof_SUITEAnthony Ramine2013-01-151-8/+8
| * | | | | | | | | | | Make trace_local_SUITE work without the reverse eta conversionAnthony Ramine2013-01-101-1/+1
| * | | | | | | | | | | Remove the reverse eta-conversion from v3_kernelAnthony Ramine2012-12-032-19/+30
* | | | | | | | | | | | Merge branch 'nox/promote-inline_list_funcs/OTP-10690'Fredrik Gustafsson2013-01-183-36/+145
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |