Prefer locally-defined lotman policies over federation-generated poli…

…cies
jhiemstrawisc · Dec 17, 2024 · 4565773 · 4565773
1 parent 40fe589
commit 4565773
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lotman/lotman_linux.go b/lotman/lotman_linux.go
@@ -837,7 +837,7 @@ func initLots(nsAds []server_structs.NamespaceAdV2) ([]Lot, error) {
 		// Handle potential need to merge discovered namespaces with provided configuration
 		if shouldMerge {
 			log.Debug("Merging lot configuration from discovered namespaces with configured lots")
-			lotMap, err = mergeLotMaps(directorLotMap, policyLotMap)
+			lotMap, err = mergeLotMaps(policyLotMap, directorLotMap)
 			if err != nil {
 				return internalLots, errors.Wrap(err, "error merging discovered namespaces with configured lots")
 			}