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 2018/12/12 09:53:09 UTC
[30/32] james-project git commit: Merge remote-tracking branch
'mine/JAMES-2617-es6-metrics-2'
Merge remote-tracking branch 'mine/JAMES-2617-es6-metrics-2'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ea46c133
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ea46c133
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ea46c133
Branch: refs/heads/master
Commit: ea46c1333ed9a58268af0e7b6d16db28710245bc
Parents: 5b46ce3 bc91c5e
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Wed Dec 12 10:50:38 2018 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Dec 12 10:50:38 2018 +0100
----------------------------------------------------------------------
.../james/mailbox/MailboxManagerTest.java | 60 ++++----
.../mailet/base/MailetPipelineLoggingTest.java | 12 +-
pom.xml | 12 +-
.../JamesServerWithRetryConnectionTest.java | 2 +-
.../metrics/metrics-es-reporter/pom.xml | 27 +++-
.../james/metrics/es/ESMetricReporter.java | 3 +-
.../es/DockerElasticSearch2Extension.java | 61 ++++++++
.../es/DockerElasticSearch6Extension.java | 62 ++++++++
.../apache/james/metric/es/ES2ReporterTest.java | 26 ++++
.../apache/james/metric/es/ES6ReporterTest.java | 26 ++++
.../metric/es/ESReportedConfigurationTest.java | 48 +++----
.../james/metric/es/ESReporterContract.java | 127 ++++++++++++++++
.../apache/james/metric/es/ESReporterTest.java | 143 -------------------
.../ldap/ReadOnlyUsersLDAPRepositoryTest.java | 2 +-
.../apache/james/jmap/model/KeywordsTest.java | 1 +
.../org/apache/james/util/docker/Images.java | 3 +-
.../spamassassin/SpamAssassinExtension.java | 9 +-
17 files changed, 392 insertions(+), 232 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea46c133/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea46c133/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea46c133/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org