Merge remote-tracking branch 'antoine/JAMES-1810'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0dd61725 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0dd61725 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0dd61725 Branch: refs/heads/master Commit: 0dd61725970bf197d5aa1ed0b2f7a8c1199fd2ef Parents: 02fd0ae b57b444 Author: Matthieu Baechler <[email protected]> Authored: Tue Jul 26 14:49:12 2016 +0200 Committer: Matthieu Baechler <[email protected]> Committed: Tue Jul 26 14:49:12 2016 +0200 ---------------------------------------------------------------------- .../james/mailbox/indexer/ReIndexerImpl.java | 3 ++ .../java/org/apache/james/cli/ServerCmd.java | 44 ++++++++++---------- .../mailbox/ElasticSearchMailboxModule.java | 2 + .../james/modules/server/JMXServerModule.java | 13 +++++- .../adapter/mailbox/ReIndexerManagement.java | 8 +++- .../META-INF/org/apache/james/spring-server.xml | 4 +- 6 files changed, 46 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
