From: Tom Clegg <tom@tomclegg.ca>
Date: Tue, 18 Feb 2020 21:26:46 +0000 (-0500)
Subject: 15954: Merge branch 'master'
X-Git-Tag: 2.1.0~273^2~60
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/63b1a5c12557bb11505f9dcfcc955f328b51e118

15954: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

63b1a5c12557bb11505f9dcfcc955f328b51e118
diff --cc go.mod
index 85e5552f63,2f18527340..6d5f748d42
--- a/go.mod
+++ b/go.mod
@@@ -30,8 -31,9 +31,9 @@@ require 
  	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
  	github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff
  	github.com/julienschmidt/httprouter v1.2.0
+ 	github.com/karalabe/xgo v0.0.0-20191115072854-c5ccff8648a7 // indirect
  	github.com/kevinburke/ssh_config v0.0.0-20171013211458-802051befeb5 // indirect
 -	github.com/lib/pq v0.0.0-20171126050459-83612a56d3dd
 +	github.com/lib/pq v1.3.0
  	github.com/marstr/guid v1.1.1-0.20170427235115-8bdf7d1a087c // indirect
  	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747 // indirect
  	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect