diff options
| author | Lukas Larsson <[email protected]> | 2014-03-27 10:23:28 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-03-27 10:23:28 +0100 |
| commit | be5ad8be918b803d4224e8d6b17a508d2559b8a1 (patch) | |
| tree | b2ff548843c6abc9b2ada2cc0fdc4ef5f0ce4525 /erts/preloaded/src/erts_internal.erl | |
| parent | 70d60cb4d825464149ca48fdeeb350ac4689cc00 (diff) | |
| parent | b7c95eabf6017ddb352fb8ce2b3749af108ebf29 (diff) | |
| download | otp-be5ad8be918b803d4224e8d6b17a508d2559b8a1.tar.gz otp-be5ad8be918b803d4224e8d6b17a508d2559b8a1.tar.bz2 otp-be5ad8be918b803d4224e8d6b17a508d2559b8a1.zip | |
Merge branch 'matwey/systemd/OTP-11829'
* matwey/systemd/OTP-11829:
Add systemd socket activation for epmd.
Conflicts:
erts/epmd/src/epmd_int.h
Extra ticket: OTP-11828
Diffstat (limited to 'erts/preloaded/src/erts_internal.erl')
0 files changed, 0 insertions, 0 deletions