diff options
| author | Henrik Nord <henrik@erlang.org> | 2011-04-08 17:20:34 +0200 |
|---|---|---|
| committer | Henrik Nord <henrik@erlang.org> | 2011-04-08 17:20:45 +0200 |
| commit | e9f9c30b9c0ab94a615cc1dfa56cb36c03c804ea (patch) | |
| tree | 0f243266fa95f83a2ac8f416fd338375302793b6 /lib/kernel/src | |
| parent | b42123ea3de0a9d5d9294fe10ee1bbca33b08fb0 (diff) | |
| parent | 169d7e440437c8b329cef82c4a260a990956caa7 (diff) | |
| download | erlang-e9f9c30b9c0ab94a615cc1dfa56cb36c03c804ea.tar.gz | |
Merge branch 'mk/net-kernel-epmd-return-list' into dev
* mk/net-kernel-epmd-return-list:
Fix list returned by net_kernel:epmd_module
OTP-9215
Diffstat (limited to 'lib/kernel/src')
| -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. |