Merge branch '20529-container-deadlocks' refs #20529 2.6.2
authorPeter Amstutz <peter.amstutz@curii.com>
Mon, 22 May 2023 15:33:46 +0000 (11:33 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Mon, 22 May 2023 15:38:00 +0000 (11:38 -0400)
commit3cb5e61dc56d30e159f286f306351800bb4a0729
tree02caa9767b92e2fab830e7238f320428daa2cb09
parent5ed5fa1d14ae2ca9cd705e95e792112ec5f7c3ae
Merge branch '20529-container-deadlocks' refs #20529

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
services/api/app/controllers/arvados/v1/container_requests_controller.rb
services/api/app/controllers/arvados/v1/containers_controller.rb
services/api/lib/update_priorities.rb
services/api/test/functional/arvados/v1/containers_controller_test.rb