aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cosProperty
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2015-03-06 12:18:05 +0100
committerPeter Andersson <[email protected]>2015-03-06 12:18:05 +0100
commit6b635b516a6721d5b6a7b08e501004857175a183 (patch)
tree5b313085f65c2dfa1443b35a0b1b573690c88e79 /lib/cosProperty
parente6d39e161f14f5d9a4dc9c44ee1f31b47343567a (diff)
parent483951325bbb25ba33539dde7098e0df9800bc18 (diff)
downloadotp-6b635b516a6721d5b6a7b08e501004857175a183.tar.gz
otp-6b635b516a6721d5b6a7b08e501004857175a183.tar.bz2
otp-6b635b516a6721d5b6a7b08e501004857175a183.zip
Merge branch 'peppe/common_test/ct_telnet_timeout_error' into maint
* peppe/common_test/ct_telnet_timeout_error: Make sure total_timeout can get triggered before idle_timeout OTP-12335
Diffstat (limited to 'lib/cosProperty')
0 files changed, 0 insertions, 0 deletions