diff options
| author | Micael Karlberg <[email protected]> | 2011-04-15 12:08:38 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-15 12:08:38 +0200 |
| commit | f5cb2e252f789ed9fc99f638772b9292a2df7c44 (patch) | |
| tree | 5accea367e85cbe63afa9927c1239ef995daa16c /lib/kernel/src/net_kernel.erl | |
| parent | bb6e729795ebf3dddfcfd7182384bda59e9f6a94 (diff) | |
| parent | 23906a01725f4494b8816c242926d08aeca0ef67 (diff) | |
| download | otp-f5cb2e252f789ed9fc99f638772b9292a2df7c44.tar.gz otp-f5cb2e252f789ed9fc99f638772b9292a2df7c44.tar.bz2 otp-f5cb2e252f789ed9fc99f638772b9292a2df7c44.zip | |
Merge branch 'dev' into bmk/snmp/snmp420_integration
Diffstat (limited to 'lib/kernel/src/net_kernel.erl')
| -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. |