Merge remote-tracking branch 'raphael/JAMES-1772'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6e153c4c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6e153c4c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6e153c4c Branch: refs/heads/master Commit: 6e153c4c3d5b09e0c4356a5c83ab08729f0d5215 Parents: 4097e09 68ddd58 Author: Matthieu Baechler <[email protected]> Authored: Wed Jun 22 11:28:49 2016 +0200 Committer: Matthieu Baechler <[email protected]> Committed: Wed Jun 22 11:28:49 2016 +0200 ---------------------------------------------------------------------- .../init/ClusterWithKeyspaceCreatedFactory.java | 48 +++++++++++++++----- .../backends/cassandra/CassandraCluster.java | 5 +- .../modules/mailbox/CassandraSessionModule.java | 14 +++--- .../server/CamelMailetContainerModule.java | 8 +++- .../james/http/jetty/JettyHttpServer.java | 6 ++- server/pom.xml | 2 +- .../netty/AbstractConfigurableAsyncServer.java | 6 +-- 7 files changed, 64 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6e153c4c/server/pom.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
