[arvados] updated: 2.6.0-534-g1c4bf0f3bb

[git repository hosting]

Summary of changes:
 services/api/app/models/container.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  1c4bf0f3bbc09808f4937dafa6c3023604b73dce (commit)
      from  a38f5a5d70f836904690bcfac911b9765af479a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1c4bf0f3bbc09808f4937dafa6c3023604b73dce
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Aug 23 09:31:47 2023 -0400

    20877: Fix missing 'and'
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index e918650c9f..d2e76f74e3 100644
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -746,7 +746,7 @@ class Container < ArvadosModel
                                    joins('left outer join containers as requesting_container on container_requests.requesting_container_uuid = requesting_container.uuid').
                                    where("container_requests.container_uuid = ? and "+
                                          "container_requests.priority > 0 and "+
-                                         "container_requests.owner_uuid not in (select group_uuid from trashed_groups) "+
+                                         "container_requests.owner_uuid not in (select group_uuid from trashed_groups) and "+
                                          "(requesting_container.priority is null or (requesting_container.state = 'Running' and requesting_container.priority > 0)) and "+
                                          "container_requests.state = 'Committed' and "+
                                          "container_requests.container_count < container_requests.container_count_max", uuid).

-----------------------------------------------------------------------


hooks/post-receive
--