diff options
| author | Raimo Niskanen <[email protected]> | 2019-02-22 11:05:48 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-02-22 11:10:57 +0100 |
| commit | 73587632918cefc05d4112db74548b6770b35f9c (patch) | |
| tree | 4fe3c92f40782dccb624160a8e671be113b4922d /lib/common_test/src/ct_master.erl | |
| parent | 9e9884640b7d0ee69cd39909842ec5fc8826859f (diff) | |
| parent | 59c1634e7972746ab3f144bbd65922bcb1d9c630 (diff) | |
| download | otp-73587632918cefc05d4112db74548b6770b35f9c.tar.gz otp-73587632918cefc05d4112db74548b6770b35f9c.tar.bz2 otp-73587632918cefc05d4112db74548b6770b35f9c.zip | |
Merge branch ssl-active-n of essen:erlang/otp into essen/ssl-active-n
* essen:erlang/otp:
fixup! ssl: Add support for {active,N}
ssl: Use common fonction to update {active,N}
ssl: Document {active,N}
ssl: Add support for {active,N}
Conflicts:
lib/ssl/src/ssl_connection.erl
Diffstat (limited to 'lib/common_test/src/ct_master.erl')
0 files changed, 0 insertions, 0 deletions