From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 24 May 2019 19:11:45 +0000 (-0400)
Subject: 15003: Merge branch 'master'
X-Git-Tag: 2.0.0~321^2~8
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/15c688d1c4b41232536d0a275dd5c0fdb8879a00

15003: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

15c688d1c4b41232536d0a275dd5c0fdb8879a00
diff --cc lib/service/cmd.go
index cfc40778fe,955b21f9ea..fdcf3b4ac5
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@@ -10,8 -10,7 +10,9 @@@ import 
  	"flag"
  	"fmt"
  	"io"
+ 	"io/ioutil"
 +	"log"
 +	"net"
  	"net/http"
  	"net/url"
  	"os"