diff options
| author | Micael Karlberg <[email protected]> | 2011-04-12 18:09:11 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-12 18:09:11 +0200 |
| commit | a0c01db642374fb9fbbbb47263929f1e442e20d7 (patch) | |
| tree | 4a080c6a416eeaddbfdfca343d3f3d898639b289 /lib/kernel | |
| parent | 4346b5dae76052e8c06b1cda70d561b10c1c486d (diff) | |
| parent | 47fc3df88eada4b07d8805dbc7fd418f6fac1c11 (diff) | |
| download | otp-a0c01db642374fb9fbbbb47263929f1e442e20d7.tar.gz otp-a0c01db642374fb9fbbbb47263929f1e442e20d7.tar.bz2 otp-a0c01db642374fb9fbbbb47263929f1e442e20d7.zip | |
Merge branch 'dev' into bmk/inets/inet56_integration
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/src/net_kernel.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl index 49a02359b0..5228d4fe01 100644 --- a/lib/kernel/src/net_kernel.erl +++ b/lib/kernel/src/net_kernel.erl @@ -1249,7 +1249,7 @@ protocol_childspecs([H|T]) -> epmd_module() -> case init:get_argument(epmd_module) of {ok,[[Module]]} -> - Module; + list_to_atom(Module); _ -> erl_epmd end. |