From 5b6a99528f1591ce682c30018b36cbb3a5e13762 Mon Sep 17 00:00:00 2001 From: Kaloian Manassiev Date: Thu, 8 Sep 2022 13:34:31 +0200 Subject: SERVER-69483 Merge db_raii and catalog_raii into shard_role --- src/mongo/db/ops/SConscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mongo/db/ops') diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript index 393b18209e9..be406be81d0 100644 --- a/src/mongo/db/ops/SConscript +++ b/src/mongo/db/ops/SConscript @@ -15,7 +15,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/curop', @@ -26,6 +25,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/image_collection_entry', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/db/shard_role', '$BUILD_DIR/mongo/db/update/update_driver', ], ) @@ -40,7 +40,6 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/catalog_helpers', '$BUILD_DIR/mongo/db/catalog/collection_crud', '$BUILD_DIR/mongo/db/catalog/collection_options', - '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/curop_metrics', @@ -49,8 +48,10 @@ env.Library( '$BUILD_DIR/mongo/db/record_id_helpers', '$BUILD_DIR/mongo/db/repl/oplog', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/shard_role', '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/stats/server_read_concern_write_concern_metrics', + '$BUILD_DIR/mongo/db/stats/top', '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util', '$BUILD_DIR/mongo/db/transaction/transaction', '$BUILD_DIR/mongo/util/fail_point', -- cgit v1.2.1