projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0775dd5 de36bef)
Merge branch '19320-spot-pricing'
authorTom Clegg <tom@curii.com>
Fri, 27 Jan 2023 14:51:58 +0000 (09:51 -0500)
committerTom Clegg <tom@curii.com>
Fri, 27 Jan 2023 14:51:58 +0000 (09:51 -0500)
refs #19320

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

1  2 
lib/config/config.default.yml patch | diff1 | diff2 | blob | history
lib/crunchrun/crunchrun.go patch | diff1 | diff2 | blob | history
lib/crunchrun/crunchrun_test.go patch | diff1 | diff2 | blob | history

diff --cc lib/config/config.default.yml
Simple merge
diff --cc lib/crunchrun/crunchrun.go
Simple merge
diff --cc lib/crunchrun/crunchrun_test.go
Simple merge