Merge branch '18693-dedup-permissions'
authorTom Clegg <tom@curii.com>
Wed, 18 Jan 2023 15:11:06 +0000 (10:11 -0500)
committerTom Clegg <tom@curii.com>
Wed, 18 Jan 2023 15:11:06 +0000 (10:11 -0500)
fixes #18693

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

1  2 
lib/config/config.default.yml
lib/config/export.go
sdk/go/arvados/config.go
sdk/python/tests/run_test_server.py
services/api/db/structure.sql

Simple merge
Simple merge
Simple merge
Simple merge
index 9f0e30fc47ae242b5643150947718de13791f397,e00f6029158a4420a8c2454ac9847a5b5397a4e7..002b470b120c81fd100b86d701496826cc074eda
@@@ -3186,6 -3186,6 +3186,7 @@@ INSERT INTO "schema_migrations" (versio
  ('20220505112900'),
  ('20220726034131'),
  ('20220804133317'),
 -('20221219165512');
++('20221219165512'),
 +('20221230155924');