From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Tue, 18 Dec 2018 15:02:55 +0000 (-0500)
Subject: Merge branch 'master' into 14360-dispatch-cloud
X-Git-Tag: 1.4.0~180^2~11
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e8f99cfef7cfbfcf1a1485d69250f24ced3fd609

Merge branch 'master' into 14360-dispatch-cloud

refs #14360

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

e8f99cfef7cfbfcf1a1485d69250f24ced3fd609
diff --cc lib/dispatchcloud/node_size.go
index e77c862b36,339e042c1a..2fac799f40
--- a/lib/dispatchcloud/node_size.go
+++ b/lib/dispatchcloud/node_size.go
@@@ -6,7 -6,13 +6,10 @@@ package dispatchclou
  
  import (
  	"errors"
+ 	"log"
 -	"os/exec"
+ 	"regexp"
  	"sort"
+ 	"strconv"
 -	"strings"
 -	"time"
  
  	"git.curoverse.com/arvados.git/sdk/go/arvados"
  )