aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2012-11-12 14:11:47 +0100
committerRickard Green <[email protected]>2012-11-12 14:11:47 +0100
commit8510507b00b51da4be335faea40116684a380f9a (patch)
tree233194b976773b6ffceeada15cb8e95a631ceee8 /lib/megaco
parenta665a0fbebee3a62ba465cc94d93f06413381ae8 (diff)
parent135fdb3b1804089c5170c5995a9dae653a28f927 (diff)
downloadotp-8510507b00b51da4be335faea40116684a380f9a.tar.gz
otp-8510507b00b51da4be335faea40116684a380f9a.tar.bz2
otp-8510507b00b51da4be335faea40116684a380f9a.zip
Merge branch 'maint'
* maint: ssl: Adopt test case to not take so long Fix bug in erts_port_task_schedule() Use reduction limit in order to determine when to do wakeup Conflicts: erts/emulator/beam/erl_port_task.c erts/emulator/beam/erl_process.c
Diffstat (limited to 'lib/megaco')
0 files changed, 0 insertions, 0 deletions