[ARVADOS] updated: 2.1.0-1185-g48ef169e0

[Git user]

Summary of changes:
 services/api/app/models/collection.rb     |  4 +++-
 services/api/test/unit/collection_test.rb | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

       via  48ef169e011a3335470e940cc0670bca27358dc1 (commit)
       via  9214382fc7083d0310675ce3760144ad7b6cb070 (commit)
       via  c3481a62091153eb0f74cd2f769d46c552765fcb (commit)
       via  5861d894b9b6614437fadfa261b7db1d4920d729 (commit)
      from  f67c3d18e58d4d6f331763a9728f1ef1595558d7 (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 48ef169e011a3335470e940cc0670bca27358dc1
Merge: f67c3d18e 9214382fc
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Aug 12 09:06:36 2021 -0400

    17947: Merge branch 'main' into 17947-centos7-package-conflict
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>


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


hooks/post-receive
--