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 ma...@apache.org on 2018/05/22 12:55:05 UTC

[4/4] james-project git commit: Merge branch 'pr-1426'

Merge branch 'pr-1426'


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/43a09f93
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/43a09f93
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/43a09f93

Branch: refs/heads/master
Commit: 43a09f93b0fa40dea8c06aab517d5228997119e1
Parents: ffb3abc 0dd4b49
Author: Matthieu Baechler <ma...@apache.org>
Authored: Tue May 22 14:54:34 2018 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Tue May 22 14:54:34 2018 +0200

----------------------------------------------------------------------
 .../QuotaMailingListenerConfiguration.java      | 147 +++++++++++++++----
 .../subscribers/QuotaThresholdNotice.java       |  16 +-
 .../QuotaMailingListenerConfigurationTest.java  | 102 ++++++++++---
 .../subscribers/QuotaThresholdNoticeTest.java   | 135 ++++++++++++++++-
 .../src/test/resources/templates/body1.mustache |   1 +
 .../src/test/resources/templates/body2.mustache |   1 +
 .../test/resources/templates/subject1.mustache  |   1 +
 .../test/resources/templates/subject2.mustache  |   1 +
 .../src/test/resources/listeners.xml            |   8 +-
 .../src/test/resources/listeners.xml            |   8 +-
 10 files changed, 363 insertions(+), 57 deletions(-)
----------------------------------------------------------------------



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