This is an automated email from the ASF dual-hosted git repository.

aduprat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 08e06b89ec25d415d37ebae7c8d4b148c5272522
Merge: bbc3033 e67e60f
Author: Antoine Duprat <adup...@linagora.com>
AuthorDate: Wed Apr 10 09:54:57 2019 +0200

    Merge remote-tracking branch 'gdifolco/JAMES-2732'

 .../apache/james/mailbox/backup/ZipAssertTest.java |  4 +-
 .../james/mailbox/events/InVMEventBusTest.java     |  2 +-
 .../mailbox/events/LocalListenerRegistryTest.java  | 50 +++++++++++-----------
 .../apache/james/event/json/SerializerFixture.java |  1 -
 .../vault/DeletedMessageVaultSearchContract.java   |  4 +-
 .../james/vault/RetentionConfigurationTest.java    |  2 +-
 .../blob/objectstorage/AESPayloadCodecTest.java    |  2 -
 .../james/blob/union/UnionBlobStoreTest.java       |  5 ++-
 .../apache/james/modules/RabbitMQExtension.java    |  3 +-
 .../SetMessagesOutboxFlagUpdateTest.java           |  1 -
 .../EventDeadLettersIntegrationTest.java           |  1 -
 .../james/queue/rabbitmq/EnqueuedItemTest.java     |  6 +--
 .../view/cassandra/EnqueuedMailsDaoUtilTest.java   |  3 +-
 .../view/cassandra/configuration/DTOTest.java      |  2 +-
 .../model/EnqueuedItemWithSlicingContextTest.java  |  6 +--
 15 files changed, 46 insertions(+), 46 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to