This is an automated email from the ASF dual-hosted git repository. snazy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push: new 260438f9c Fix soft-merge conflict on `main` (#2364) 260438f9c is described below commit 260438f9c2393ed682ad86f5f95928379ca6d306 Author: Robert Stupp <sn...@snazy.de> AuthorDate: Fri Aug 15 16:41:07 2025 +0200 Fix soft-merge conflict on `main` (#2364) --- .../org/apache/polaris/service/catalog/AbstractPolicyCatalogTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolicyCatalogTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolicyCatalogTest.java index cf0717f54..343ab6ce3 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolicyCatalogTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolicyCatalogTest.java @@ -194,7 +194,7 @@ public abstract class AbstractPolicyCatalogTest { metaStoreManager, userSecretsManager, securityContext, - new PolarisAuthorizerImpl(callContext.getRealmConfig()), + new PolarisAuthorizerImpl(realmConfig), reservedProperties); String storageLocation = "s3://my-bucket/path/to/data";