projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7eb7c12
e61d0c9
)
Merge branch '15026-cloudtest'
author
Tom Clegg <tclegg@veritasgenetics.com>
Wed, 26 Jun 2019 18:55:31 +0000
(14:55 -0400)
committer
Tom Clegg <tclegg@veritasgenetics.com>
Wed, 26 Jun 2019 18:55:31 +0000
(14:55 -0400)
refs #15026
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
1
2
lib/config/config.default.yml
patch
|
diff1
|
diff2
|
blob
|
history
lib/config/generated_config.go
patch
|
diff1
|
diff2
|
blob
|
history
lib/dispatchcloud/dispatcher_test.go
patch
|
diff1
|
diff2
|
blob
|
history
lib/dispatchcloud/driver.go
patch
|
diff1
|
diff2
|
blob
|
history
lib/dispatchcloud/worker/pool.go
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/config/config.default.yml
Simple merge
diff --cc
lib/config/generated_config.go
Simple merge
diff --cc
lib/dispatchcloud/dispatcher_test.go
Simple merge
diff --cc
lib/dispatchcloud/driver.go
Simple merge
diff --cc
lib/dispatchcloud/worker/pool.go
Simple merge