aboutsummaryrefslogtreecommitdiffstats
path: root/lib/et
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-06-09 14:52:35 +0200
committerSiri Hansen <[email protected]>2016-06-09 14:52:35 +0200
commit68ff9f3e4b5387cf38af7aeb1a8b7abbdaa867d8 (patch)
treeb34c9396a56b03968beaf3cdbab56e4a8a4847d2 /lib/et
parent75e5cdabbcaaa12f043225ca8d361055a9d47b24 (diff)
parentbaf5751951f3463d599ccb958272ab6a6fec39b4 (diff)
downloadotp-68ff9f3e4b5387cf38af7aeb1a8b7abbdaa867d8.tar.gz
otp-68ff9f3e4b5387cf38af7aeb1a8b7abbdaa867d8.tar.bz2
otp-68ff9f3e4b5387cf38af7aeb1a8b7abbdaa867d8.zip
Merge branch 'siri/cuddle-master'
* siri/cuddle-master: [ct test] Wait for event receiver to be unregistered [ct test] Flush messages from old client after close in telnet server [ct test] Use monitor instead of ct:sleep [ct test] Check that crypto is loaded, or skip netconf tests [ct test] Reduce amount of data in netconfc1_SUITE:get_a_lot
Diffstat (limited to 'lib/et')
0 files changed, 0 insertions, 0 deletions