diff options
| author | Erlang/OTP <[email protected]> | 2016-01-29 15:13:38 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-01-29 15:13:38 +0100 |
| commit | 80e2ab864725f62ba0e4e8e6d1d14ac4272c9ab2 (patch) | |
| tree | 60f2d2fa5efdb3a837a3102388c5462ab32f0ef0 /lib/os_mon | |
| parent | 7cf9a621c5280a3e97967c4c63ab6ca1adde69c3 (diff) | |
| parent | a6a766143bd5332ff0173a9a3c05e3b36d20297c (diff) | |
| download | otp-80e2ab864725f62ba0e4e8e6d1d14ac4272c9ab2.tar.gz otp-80e2ab864725f62ba0e4e8e6d1d14ac4272c9ab2.tar.bz2 otp-80e2ab864725f62ba0e4e8e6d1d14ac4272c9ab2.zip | |
Merge branch 'ia/maint/inets/mod_alias/OTP-13248' into maint-18
* ia/maint/inets/mod_alias/OTP-13248:
inets: Prepare for release
inets: Traverse all aliases looking for the longest match
inets: Use re instead of inets_regexp
# Conflicts:
# lib/inets/vsn.mk
Diffstat (limited to 'lib/os_mon')
0 files changed, 0 insertions, 0 deletions