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 ad...@apache.org on 2017/02/10 21:41:26 UTC
[3/3] james-project git commit: Merge remote-tracking branch
'mine/JAMES-1928'
Merge remote-tracking branch 'mine/JAMES-1928'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/47d29f1a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/47d29f1a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/47d29f1a
Branch: refs/heads/master
Commit: 47d29f1a8077f2073b6345ce24fc3dd781570aae
Parents: 23e0f09 b75aac5
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Feb 10 22:40:56 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Feb 10 22:40:56 2017 +0100
----------------------------------------------------------------------
dockerfiles/compilation/java-8/compile.sh | 3 +
dockerfiles/run/guice/cassandra-ldap/Dockerfile | 31 ++
.../destination/conf/cassandra.properties | 6 +
.../destination/conf/dnsservice.xml | 29 ++
.../destination/conf/domainlist.xml | 28 ++
.../destination/conf/elasticsearch.properties | 36 +++
.../destination/conf/fetchmail.xml | 288 +++++++++++++++++++
.../destination/conf/imapserver.xml | 54 ++++
.../cassandra-ldap/destination/conf/indexer.xml | 23 ++
.../destination/conf/jmap.properties | 11 +
.../destination/conf/jmx.properties | 28 ++
.../destination/conf/jwt_publickey | 9 +
.../cassandra-ldap/destination/conf/keystore | Bin 0 -> 2224 bytes
.../destination/conf/lib/README.txt | 1 +
.../destination/conf/lmtpserver.xml | 41 +++
.../cassandra-ldap/destination/conf/logback.xml | 28 ++
.../destination/conf/mailetcontainer.xml | 187 ++++++++++++
.../destination/conf/mailrepositorystore.xml | 34 +++
.../destination/conf/managesieve.help.txt | 112 ++++++++
.../destination/conf/managesieveserver.xml | 65 +++++
.../destination/conf/pop3server.xml | 42 +++
.../cassandra-ldap/destination/conf/quota.xml | 53 ++++
.../destination/conf/recipientrewritetable.xml | 26 ++
.../cassandra-ldap/destination/conf/smime.p12 | Bin 0 -> 4141 bytes
.../destination/conf/smtpserver.xml | 105 +++++++
.../destination/conf/usersrepository.xml | 28 ++
.../destination/conf/webadmin.properties | 22 ++
27 files changed, 1290 insertions(+)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org