projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0eed4e e2d623b)
16636: Merge branch 'master' into 16636-more-metrics
authorWard Vandewege <ward@curii.com>
Tue, 15 Sep 2020 19:32:15 +0000 (15:32 -0400)
committerWard Vandewege <ward@curii.com>
Tue, 15 Sep 2020 19:32:30 +0000 (15:32 -0400)
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

1  2 
lib/dispatchcloud/dispatcher_test.go patch | diff1 | diff2 | blob | history
lib/dispatchcloud/worker/pool.go patch | diff1 | diff2 | blob | history
lib/dispatchcloud/worker/worker.go patch | diff1 | diff2 | blob | history

diff --cc lib/dispatchcloud/dispatcher_test.go
Simple merge
diff --cc lib/dispatchcloud/worker/pool.go
Simple merge
diff --cc lib/dispatchcloud/worker/worker.go
Simple merge