This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a2b3b2854ab5dec98da4580960a39b57d2be995b Merge: 069f81f bf600b0 Author: Raphael Ouazana <[email protected]> AuthorDate: Mon Dec 16 18:09:29 2019 +0100 Merge remote-tracking branch 'mbaechler/revert-boundedElasticScheduler-use' .../backends/cassandra/init/CassandraTableManager.java | 2 +- .../cassandra/init/ResilientClusterProvider.java | 4 ++-- .../backends/cassandra/utils/CassandraAsyncExecutor.java | 2 +- .../org/apache/james/backends/es/ClientProvider.java | 4 ++-- .../james/backends/es/ElasticSearchClusterExtension.java | 2 +- .../backends/rabbitmq/RabbitMQConnectionFactory.java | 2 +- .../backends/rabbitmq/ReactorRabbitMQChannelPool.java | 2 +- .../james/backends/rabbitmq/SimpleConnectionPool.java | 2 +- .../james/mailbox/backup/DefaultMailboxBackup.java | 2 +- .../mailbox/cassandra/mail/CassandraMessageDAO.java | 2 +- .../mailbox/cassandra/mail/CassandraMessageIdMapper.java | 4 ++-- .../mailbox/cassandra/mail/CassandraMessageMapper.java | 2 +- .../mailbox/cassandra/mail/CassandraModSeqProvider.java | 2 +- .../james/mailbox/events/delivery/EventDelivery.java | 2 +- .../org/apache/james/mailbox/events/EventDispatcher.java | 2 +- .../apache/james/mailbox/events/GroupRegistration.java | 2 +- .../james/mailbox/events/KeyRegistrationHandler.java | 2 +- .../apache/james/mailbox/events/WaitDelayGenerator.java | 2 +- .../james/mailbox/events/LocalListenerRegistryTest.java | 2 +- .../james/vault/blob/BlobStoreDeletedMessageVault.java | 2 +- .../vault/blob/BlobStoreVaultGarbageCollectionTask.java | 2 +- .../org/apache/james/mailbox/store/PreDeletionHooks.java | 2 +- .../apache/james/mailbox/store/StoreMessageManager.java | 2 +- .../src/main/java/org/apache/james/blob/api/Store.java | 2 +- .../apache/james/blob/cassandra/CassandraBlobStore.java | 6 +++--- .../james/blob/objectstorage/ObjectStorageBlobStore.java | 6 +++--- .../blob/objectstorage/StreamCompatibleBlobPutter.java | 6 +++--- .../james/blob/objectstorage/aws/AwsS3ObjectStorage.java | 4 ++-- .../blob/objectstorage/ObjectStorageBlobStoreTest.java | 8 ++++---- .../java/org/apache/james/StartUpChecksPerformer.java | 2 +- .../org/apache/james/GuiceLifecycleHeathCheckTest.java | 2 +- .../src/main/java/org/apache/james/util/Runnables.java | 4 ++-- .../java/org/apache/james/util/ReactorUtilsTest.java | 8 ++++---- .../jmap/api/projections/MessageFastViewProjection.java | 2 +- .../james/transport/mailets/delivery/MailDispatcher.java | 2 +- .../draft/model/message/view/MessageFastViewFactory.java | 2 +- .../draft/model/message/view/MessageFullViewFactory.java | 4 ++-- .../event/ComputeMessageFastViewProjectionListener.java | 2 +- .../apache/james/queue/api/DelayedMailQueueContract.java | 6 +++--- .../queue/api/DelayedPriorityMailQueueContract.java | 4 ++-- .../org/apache/james/queue/api/MailQueueContract.java | 16 ++++++++-------- .../james/queue/api/PriorityMailQueueContract.java | 8 ++++---- .../james/queue/memory/MemoryMailQueueFactory.java | 2 +- .../view/cassandra/CassandraMailQueueMailDelete.java | 2 +- .../distributed/RabbitMQTerminationSubscriber.java | 4 ++-- .../eventsourcing/distributed/RabbitMQWorkQueue.java | 6 +++--- .../eventsourcing/distributed/RabbitMQWorkQueueTest.java | 2 +- .../java/org/apache/james/task/MemoryTaskManager.java | 2 +- .../main/java/org/apache/james/task/MemoryWorkQueue.java | 2 +- .../org/apache/james/task/SerialTaskManagerWorker.java | 2 +- .../task/eventsourcing/EventSourcingTaskManager.scala | 2 +- .../eventsourcing/TerminationSubscriberContract.java | 6 +++--- 52 files changed, 88 insertions(+), 88 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
