aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2019-01-07 15:45:39 +0100
committerHans Nilsson <[email protected]>2019-01-07 15:45:39 +0100
commit22636c38163e0a5ceb4feb71f72c62679a590a78 (patch)
treead85256be58a183cbf2c4c30b87ccf3ab71a4c88 /erts/vsn.mk
parentd8bbddd29dc2d30d8648ff6dd3006c5db0f6fd21 (diff)
parent330a1ffcb7ad9ba6700801492e160d4b923239ca (diff)
downloadotp-22636c38163e0a5ceb4feb71f72c62679a590a78.tar.gz
otp-22636c38163e0a5ceb4feb71f72c62679a590a78.tar.bz2
otp-22636c38163e0a5ceb4feb71f72c62679a590a78.zip
Merge branch 'hans/ssh/cuddle_tests' into maint
* hans/ssh/cuddle_tests: ssh: Wait a bit for the docker client to finnish in ssh_compat_SUITE
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions