You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2016/12/20 14:56:45 UTC
[2/2] james-project git commit: Merge remote-tracking branch
'benoit/JAMES-1888-3'
Merge remote-tracking branch 'benoit/JAMES-1888-3'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/27f1e48d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/27f1e48d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/27f1e48d
Branch: refs/heads/master
Commit: 27f1e48d497e81d85cb6922bc6919fb4612122fc
Parents: 52316f6 bc74873
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Tue Dec 20 15:56:00 2016 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Tue Dec 20 15:56:00 2016 +0100
----------------------------------------------------------------------
.../james/mailbox/model/MessageAttachment.java | 3 +-
.../cassandra/mail/AttachmentLoader.java | 14 ++--
.../cassandra/mail/CassandraMessageDAO.java | 2 +-
.../mailbox/cassandra/mail/utils/MapMerger.java | 61 --------------
.../cassandra/mail/AttachmentLoaderTest.java | 84 ++++++++++++++++++++
.../cassandra/mail/utils/MapMergerTest.java | 78 ------------------
6 files changed, 93 insertions(+), 149 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org