Commit 2d008e46 authored by Philip Withnall's avatar Philip Withnall

Merge branch 'mcatanzaro/#2221' into 'master'

Fix race in socketclient-slow test

Closes #2221

See merge request !1711
parents 4926948a 1d28fd53
Pipeline #224761 failed with stages
in 19 minutes and 45 seconds