Commit 4d121746 authored by Michael Catanzaro's avatar Michael Catanzaro

Merge branch '1679-socket-service-flaky' into 'master'

Resolve "socket-service test is flaky"

Closes #1679

See merge request !687
parents 86201989 07414e17
Pipeline #61619 passed with stages
in 11 minutes and 16 seconds