aboutsummaryrefslogtreecommitdiffstats
path: root/lib/jinterface/java_src/com/ericsson/otp
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-12-01 17:07:51 +0100
committerZandra <[email protected]>2015-12-01 17:10:58 +0100
commit417101bca30b5ae246b97485c7898c4e5c663b9c (patch)
tree242992943890fbdd8576eacf36609df8ff996dc5 /lib/jinterface/java_src/com/ericsson/otp
parentb78c67a0e833abb1a43afcc016a2ab0436c08d2d (diff)
parentd00d68f96c51cc7f36d2030c7c7c6277adf998f0 (diff)
downloadotp-417101bca30b5ae246b97485c7898c4e5c663b9c.tar.gz
otp-417101bca30b5ae246b97485c7898c4e5c663b9c.tar.bz2
otp-417101bca30b5ae246b97485c7898c4e5c663b9c.zip
Merge branch 'legoscia/tls_dist_options' into maint
* legoscia/tls_dist_options: Test interface listen option for TLS distribution Test socket listen options for TLS distribution Test port options for TLS distribution TLS Dist: Use inet_dist_ options Conflicts: lib/ssl/src/ssl_tls_dist_proxy.erl lib/ssl/test/ssl_dist_SUITE.erl OTP-12838
Diffstat (limited to 'lib/jinterface/java_src/com/ericsson/otp')
0 files changed, 0 insertions, 0 deletions