diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-06-09 10:06:45 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-06-09 10:06:45 +0200 |
| commit | 6fe86a5858d2894887ea4c0f343c2c38283cf556 (patch) | |
| tree | 4b9abc447922eb1f9cb3de3646feeef5323cf8e8 /lib/kernel/src/inet.erl | |
| parent | 26316068ca1ca815a5d5f13a8769ab9e1ab60f5c (diff) | |
| parent | 84fd2c325c9e38b5ea2307b6133c3d15b33a3241 (diff) | |
| download | otp-6fe86a5858d2894887ea4c0f343c2c38283cf556.tar.gz otp-6fe86a5858d2894887ea4c0f343c2c38283cf556.tar.bz2 otp-6fe86a5858d2894887ea4c0f343c2c38283cf556.zip | |
Merge branch 'essen/ssl-getstat/PR-987/OTP-13415'
* essen/ssl-getstat/PR-987/OTP-13415:
Add ssl:getstat/1 and ssl:getstat/2
Export type inet:stat_option/0
Diffstat (limited to 'lib/kernel/src/inet.erl')
| -rw-r--r-- | lib/kernel/src/inet.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl index 20c64a39ca..9fc685e728 100644 --- a/lib/kernel/src/inet.erl +++ b/lib/kernel/src/inet.erl @@ -75,8 +75,7 @@ -export_type([address_family/0, hostent/0, hostname/0, ip4_address/0, ip6_address/0, ip_address/0, port_number/0, local_address/0, socket_address/0, returned_non_ip_address/0, - posix/0, socket/0]). - + posix/0, socket/0, stat_option/0]). %% imports -import(lists, [append/1, duplicate/2, filter/2, foldl/3]). |