From: Tom Clegg <tom@curoverse.com>
Date: Tue, 15 Nov 2016 18:25:03 +0000 (-0500)
Subject: 8460: Merge branch 'master' into 8460-websocket-go
X-Git-Tag: 1.1.0~538^2~49
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5a420beeb6c64efc3ca0ef13d4ab9ac6c654c3ab?ds=sidebyside;hp=-c

8460: Merge branch 'master' into 8460-websocket-go
---

5a420beeb6c64efc3ca0ef13d4ab9ac6c654c3ab