This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 203d801fb0 Fix merge conflict (#1710)
203d801fb0 is described below
commit 203d801fb082146ce94977294b97bc83cef05d4f
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Mon Sep 4 13:16:31 2023 +0700
Fix merge conflict (#1710)
---
.../apache/james/jmap/cassandra/upload/CassandraUploadServiceTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadServiceTest.java
b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadServiceTest.java
index b20d453b13..f87a6fa850 100644
---
a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadServiceTest.java
+++
b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadServiceTest.java
@@ -24,6 +24,7 @@ import java.time.Clock;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
+import
org.apache.james.backends.cassandra.components.CassandraMutualizedQuotaModule;
import
org.apache.james.backends.cassandra.components.CassandraQuotaCurrentValueDao;
import org.apache.james.blob.api.BucketName;
import org.apache.james.blob.api.HashBlobId;
@@ -41,7 +42,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraUploadServiceTest implements UploadServiceContract {
@RegisterExtension
static CassandraClusterExtension cassandra = new
CassandraClusterExtension(CassandraModule.aggregateModules(
- UploadModule.MODULE, CassandraQuotaModule.MODULE));
+ UploadModule.MODULE, CassandraQuotaModule.MODULE,
CassandraMutualizedQuotaModule.MODULE));
private CassandraUploadRepository uploadRepository;
private CassandraUploadUsageRepository uploadUsageRepository;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
