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 2016/10/03 07:01:39 UTC
[1/2] james-project git commit: README is actually in asciidoc
Repository: james-project
Updated Branches:
refs/heads/master b23790eec -> 2fda86985
README is actually in asciidoc
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6991e067
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6991e067
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6991e067
Branch: refs/heads/master
Commit: 6991e067190aaabffb95cddc5550ff7907e2e9c6
Parents: 3c8c176
Author: Matthieu Baechler <ma...@linagora.com>
Authored: Fri Sep 23 10:34:42 2016 +0200
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Fri Sep 23 10:34:42 2016 +0200
----------------------------------------------------------------------
README.adoc | 282 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
README.txt | 282 -------------------------------------------------------
2 files changed, 282 insertions(+), 282 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/6991e067/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
new file mode 100644
index 0000000..31dda5b
--- /dev/null
+++ b/README.adoc
@@ -0,0 +1,282 @@
+Apache James Project
+====================
+
+This is the parent module for all Apache James artifacts. It contains useful values to be inherited by other Maven projects.
+
+* the list of Apache James contributors, committers and PMC Members
+* Maven plugins managemnt section with common plugins used in the project
+* URL's and mailing-lists definitions for the project
+
+How to try James
+================
+Requirements: docker & docker-compose installed.
+
+When try James by this way, you will use the last state of James.
+It will be configured to run with Cassandra & ElasticSearch.
+All those three components will be started with a single command.
+
+First, you need to build the image:
+$ docker-compose -f dockerfiles/run/docker-compose.yml build
+
+Then, you just have to start the services:
+$ docker-compose -f dockerfiles/run/docker-compose.yml up
+
+Wait a few seconds in order to have all those services up, you will see a such log when James is available:
+james | Started : true
+
+Then, a default domain has been created: james.local
+$ docker exec james java -jar /root/james-cli.jar -h 127.0.0.1 -p 9999 listdomains
+james.local
+
+James will respond to IMAP port 143 and SMTP port 25.
+You have to create users before playing, you may also create other domains...
+Follow the 'Useful commands' section for more information about James CLI.
+
+
+
+How to build and publish the website
+====================================
+
+ 1. Install Apache Maven 3.0.2+ and make its binary 'mvn' available on your PATH.
+ See http://maven.apache.org/download.html#Installation.
+ 2. run "mvn clean site"
+ 3. Test the built site in your browser from the {path}/target/site folder
+ 4. If everything looks OK, deploy the site using "mvn clean site-deploy".
+ 5. Wait for the changes to replicate to the Apache web server or setup 140.211.11.10:80 as
+ a proxy to review the changes (described here: http://www.apache.org/dev/project-site.html)
+
+To deploy the technical reports use the "-Psite-reports" profile.
+
+For wagon-ssh-external configuration see
+http://maven.apache.org/plugins/maven-deploy-plugin/examples/deploy-ssh-external.html
+
+
+Howto release via maven release plugin
+======================================
+
+See details on http://www.apache.org/dev/publishing-maven-artifacts.html
+
+In short, just follow the 'standard' process:
+
+* Prepare pom for release
+* publish snapshot
+* prepare release
+* stage the release for a vote (don't forget to close the staging repository)
+* vote
+* release
+
+Don't forget to add your key to http://www.apache.org/dist/james/KEYS
+
+ $ ssh people.apache.org
+ $ cd /www/www.apache.org/dist/james
+
+
+Howto check the compilation
+===========================
+
+In order to have a standard compilation environment, we introduce Dockerfiles.
+We need to check the compilation in both Java 6 & Java 8:
+- Java 6 is the historical Java release used in James.
+- Java 8 is used to compile the Cassandra backend.
+
+* Java 6
+First step, you have to build the Docker image
+$ docker build -t james/project dockerfiles/compilation/java-6
+
+In order to run the build, you have to launch the following command:
+$ docker run -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/dockerfiles/run/spring/destination:/destination -t james/project -s SHA1
+
+Where:
+
+- $PWD/.m2:/root/.m2: is the first volume used to share the maven repository,
+as we don't want to download all dependencies on each build
+- $PWD/dockerfiles/run/spring/destination:/destination: is the third volume used to get the compiled elements,
+as it is needed by the container that will run James.
+- SHA1 (optional): is the given git SHA1 of the james-project repository to build or trunk if none.
+- -s option: given tests will not be played while building. Not specifying means play tests.
+
+* Java 8
+First step, you have to build the Docker image
+$ docker build -t james/project dockerfiles/compilation/java-8
+
+In order to run the build, you have to launch the following command:
+$ docker run -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/dockerfiles/run/spring/destination:/destination -t james/project -s SHA1
+
+Where:
+
+- $PWD/.m2:/root/.m2: is the first volume used to share the maven repository,
+as we don't want to download all dependencies on each build
+- $PWD/dockerfiles/run/spring/destination:/destination: is the third volume used to get the compiled elements,
+as it is needed by the container that will run James.
+- SHA1 (optional): is the given git SHA1 of the james-project repository to build or trunk if none.
+- -s option: given tests will not be played while building. Not specifying means play tests.
+
+Some tests needs a DOCKER_HOST environment variable in order to be played, they will be ignored if you don't provide this variable.
+If you wish to play them, you may use a command like the following (depending on your docker configuration):
+$ docker run --env DOCKER_HOST=tcp://172.17.0.1:2376 -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/dockerfiles/run/spring/destination:/destination -t james/project SHA1
+
+If you are using a a fresh installation of Docker, your DOCKER_HOST should be unix:///var/run/docker.sock and you should mount this socket as a volume:
+$ docker run --env DOCKER_HOST=unix:///var/run/docker.sock -v /var/run/docker.sock:/var/run/docker.sock -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/dockerfiles/run/spring/destination:/destination -t james/project SHA1
+
+
+Howto run James in Docker
+=========================
+
+This feature available for two configurations :
+
+ * Java 8 + Guice + Cassandra + ElasticSearch
+ * Java 6 + Spring + JPA
+
+
+Run James with Java 8 + Guice + Cassandra + ElasticSearch
+=========================================================
+
+## Requirements
+Built artifacts should be in ./dockerfiles/run/guice/destination folder.
+If you haven't already:
+```bash
+$ docker build -t james/project dockerfiles/compilation/java-8
+$ docker run -v $HOME/.m2:/root/.m2 -v $PWD:/origin \
+ -v $PWD/dockerfiles/run/guice/destination:/destination \
+ -t james/project -s HEAD
+```
+
+## Howto ?
+You need a running **cassandra** in docker. To achieve this run :
+```bash
+$ docker run -d --name=cassandra cassandra:2.2.3
+```
+
+You need a running **ElasticSearch** in docker. To achieve this run :
+```bash
+$ docker run -d --name=elasticsearch elasticsearch:2.2.1
+```
+
+We need to provide the key we will use for TLS. For obvious reasons, this is not provided in this git.
+
+Copy your TLS keys to `destination/run/guice/conf/keystore` or generate it using the following command. The password must be `james72laBalle` to match default configuration.
+```bash
+$ keytool -genkey -alias james -keyalg RSA -keystore dockerfiles/run/guice/destination/conf/keystore
+```
+
+Then we need to build james container :
+```bash
+$ docker build -t james_run dockerfiles/run/guice/
+```
+
+To run this container :
+```bash
+$ docker run --hostname HOSTNAME -p "25:25" -p 80:80 -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" --link cassandra:cassandra --link elasticsearch:elasticsearch --name james_run -t james_run
+```
+
+Where :
+- HOSTNAME: is the hostname you want to give to your James container. This DNS entry will be used to send mail to your James server.
+
+You can add an optional port binding to port 8000, to expose the webadmin server. Please note that users are not authenticated on webadmin server, thus you should avoid exposing it in production.
+
+Run James with Java 6 + Spring + JPA
+====================================
+
+* Requirements
+Built artifacts should be in ./dockerfiles/run/spring/destination folder.
+
+* Howto ?
+
+We need to provide the key we will use for TLS. For obvious reasons, this is not provided in this git.
+
+Copy your TSL keys to destination/run/spring/conf/keystore or generate it using the following command. The password must be james72laBalle to match default configuration.
+$ keytool -genkey -alias james -keyalg RSA -keystore dockerfiles/run/spring/destination/conf/keystore
+
+Then we need to build james container :
+$ docker build -t james_run dockerfiles/run/spring/
+
+To run this container :
+$ docker run --hostname HOSTNAME -p "25:25" -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" --name james_run -t james_run
+
+Where :
+- HOSTNAME: is the hostname you want to give to your James container. This DNS entry will be used to send mail to your James server.
+
+
+Useful commands
+===============
+
+The base command is different whether you choose guice flavor or spring :
+
+ * guice use : `docker exec james_run java -jar /root/james-cli.jar`
+ * spring use : `docker exec james_run /root/james-server-app-3.0.0-beta5-SNAPSHOT/bin/james-cli.sh`
+
+** How to add a domain ?
+# Add DOMAIN to 127.0.0.1 in your host /etc/hosts
+$ <your-command-here> -h 127.0.0.1 -p 9999 adddomain DOMAIN
+
+Where :
+- DOMAIN: is the domain you want to add.
+
+** How to add a user ?
+$ <your-command-here> -h 127.0.0.1 -p 9999 adduser USER_MAIL_ADDRESS PASSWORD
+
+Where :
+- USER_MAIL_ADDRESS: is the mail address that will be used by this user.
+- PASSWORD: is the password that will be used by this user.
+
+You can then just add DOMAIN to your /etc/hosts and you can connect to your james account with for instance Thunderbird.
+
+** How to manage SIEVE scripts ?
+Each user can manage his SIEVE scripts threw the manage SIEVE mailet.
+
+To use the manage SIEVE mailet :
+
+ - You need to create the user sievemanager@DOMAIN ( if you don't, the SMTP server will check the domain, recognize it, and look for an absent local user, and will generate an error ).
+ - You can send Manage Sieve commands by mail to sievemanager@DOMAIN. Your subject must contain the command. Scripts needs to be added as attachments and need the ".sieve" extension.
+
+To activate a script for a user, you need the following combinaison :
+
+ - PUTSCRIPT scriptname
+ - SETACTIVE scriptname
+
+** I want to retrieve users and password from my previous container
+Some james data ( those non related to mailbox, eg : mail queue, domains, users, rrt, SIEVE scripts, mail repositories ) are not yet supported by our Cassandra implementation.
+
+To keep these data when you run a new container, you can mount the following volume :
+ -v /root/james-server-app-3.0.0-beta5-SNAPSHOT/var:WORKDIR/destination/var
+
+Where :
+- WORKDIR: is the absolute path to your james-parent workdir.
+
+Beware : you will have concurrency issues if multiple containers are running on this single volume.
+
+Running deployement Tests
+=========================
+
+We wrote some MPT (James' Mail Protocols Tests subproject) deployement tests to validate a James
+deployement.
+
+It uses the External-James module, that uses environment variables to locate a remote
+IMAP server and run integration tests against it.
+
+For that, the target James Server needs to be configured with a domain domain and a user imapuser
+with password password. Read above documentation to see how you can do this.
+
+You have to run MPT tests inside docker. As you need to use maven, the simplest option is to
+use james/parent image, and override the entry point ( as git and maven are already configured
+there ) :
+$ docker run -t --entrypoint="/root/integration_tests.sh" -v $PWD/.m2:/root/.m2 -v $PWD:/origin james/project JAMES_IP JAMES_PORT SHA1
+
+Where :
+ - JAMES_IP: IP address or DNS entry for your James server
+ - JAMES_PORT: Port allocated to James' IMAP port (should be 143).
+ - SHA1(optional): Branch to use in order to build integration tests or trunk
+
+
+Howto check the merge of a commit
+=================================
+
+First step, you have to build the Docker image
+$ docker build -t james/merge dockerfiles/merge
+
+In order to run the build, you have to launch the following command:
+$ docker run -v $PWD:/origin -t james/merge SHA1 RESULTING_BRANCH
+
+Where :
+- SHA1: is the given git SHA1 of the james-project repository to merge.
+- RESULTING_BRANCH: is the branch created when merging.
http://git-wip-us.apache.org/repos/asf/james-project/blob/6991e067/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 31dda5b..0000000
--- a/README.txt
+++ /dev/null
@@ -1,282 +0,0 @@
-Apache James Project
-====================
-
-This is the parent module for all Apache James artifacts. It contains useful values to be inherited by other Maven projects.
-
-* the list of Apache James contributors, committers and PMC Members
-* Maven plugins managemnt section with common plugins used in the project
-* URL's and mailing-lists definitions for the project
-
-How to try James
-================
-Requirements: docker & docker-compose installed.
-
-When try James by this way, you will use the last state of James.
-It will be configured to run with Cassandra & ElasticSearch.
-All those three components will be started with a single command.
-
-First, you need to build the image:
-$ docker-compose -f dockerfiles/run/docker-compose.yml build
-
-Then, you just have to start the services:
-$ docker-compose -f dockerfiles/run/docker-compose.yml up
-
-Wait a few seconds in order to have all those services up, you will see a such log when James is available:
-james | Started : true
-
-Then, a default domain has been created: james.local
-$ docker exec james java -jar /root/james-cli.jar -h 127.0.0.1 -p 9999 listdomains
-james.local
-
-James will respond to IMAP port 143 and SMTP port 25.
-You have to create users before playing, you may also create other domains...
-Follow the 'Useful commands' section for more information about James CLI.
-
-
-
-How to build and publish the website
-====================================
-
- 1. Install Apache Maven 3.0.2+ and make its binary 'mvn' available on your PATH.
- See http://maven.apache.org/download.html#Installation.
- 2. run "mvn clean site"
- 3. Test the built site in your browser from the {path}/target/site folder
- 4. If everything looks OK, deploy the site using "mvn clean site-deploy".
- 5. Wait for the changes to replicate to the Apache web server or setup 140.211.11.10:80 as
- a proxy to review the changes (described here: http://www.apache.org/dev/project-site.html)
-
-To deploy the technical reports use the "-Psite-reports" profile.
-
-For wagon-ssh-external configuration see
-http://maven.apache.org/plugins/maven-deploy-plugin/examples/deploy-ssh-external.html
-
-
-Howto release via maven release plugin
-======================================
-
-See details on http://www.apache.org/dev/publishing-maven-artifacts.html
-
-In short, just follow the 'standard' process:
-
-* Prepare pom for release
-* publish snapshot
-* prepare release
-* stage the release for a vote (don't forget to close the staging repository)
-* vote
-* release
-
-Don't forget to add your key to http://www.apache.org/dist/james/KEYS
-
- $ ssh people.apache.org
- $ cd /www/www.apache.org/dist/james
-
-
-Howto check the compilation
-===========================
-
-In order to have a standard compilation environment, we introduce Dockerfiles.
-We need to check the compilation in both Java 6 & Java 8:
-- Java 6 is the historical Java release used in James.
-- Java 8 is used to compile the Cassandra backend.
-
-* Java 6
-First step, you have to build the Docker image
-$ docker build -t james/project dockerfiles/compilation/java-6
-
-In order to run the build, you have to launch the following command:
-$ docker run -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/dockerfiles/run/spring/destination:/destination -t james/project -s SHA1
-
-Where:
-
-- $PWD/.m2:/root/.m2: is the first volume used to share the maven repository,
-as we don't want to download all dependencies on each build
-- $PWD/dockerfiles/run/spring/destination:/destination: is the third volume used to get the compiled elements,
-as it is needed by the container that will run James.
-- SHA1 (optional): is the given git SHA1 of the james-project repository to build or trunk if none.
-- -s option: given tests will not be played while building. Not specifying means play tests.
-
-* Java 8
-First step, you have to build the Docker image
-$ docker build -t james/project dockerfiles/compilation/java-8
-
-In order to run the build, you have to launch the following command:
-$ docker run -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/dockerfiles/run/spring/destination:/destination -t james/project -s SHA1
-
-Where:
-
-- $PWD/.m2:/root/.m2: is the first volume used to share the maven repository,
-as we don't want to download all dependencies on each build
-- $PWD/dockerfiles/run/spring/destination:/destination: is the third volume used to get the compiled elements,
-as it is needed by the container that will run James.
-- SHA1 (optional): is the given git SHA1 of the james-project repository to build or trunk if none.
-- -s option: given tests will not be played while building. Not specifying means play tests.
-
-Some tests needs a DOCKER_HOST environment variable in order to be played, they will be ignored if you don't provide this variable.
-If you wish to play them, you may use a command like the following (depending on your docker configuration):
-$ docker run --env DOCKER_HOST=tcp://172.17.0.1:2376 -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/dockerfiles/run/spring/destination:/destination -t james/project SHA1
-
-If you are using a a fresh installation of Docker, your DOCKER_HOST should be unix:///var/run/docker.sock and you should mount this socket as a volume:
-$ docker run --env DOCKER_HOST=unix:///var/run/docker.sock -v /var/run/docker.sock:/var/run/docker.sock -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/dockerfiles/run/spring/destination:/destination -t james/project SHA1
-
-
-Howto run James in Docker
-=========================
-
-This feature available for two configurations :
-
- * Java 8 + Guice + Cassandra + ElasticSearch
- * Java 6 + Spring + JPA
-
-
-Run James with Java 8 + Guice + Cassandra + ElasticSearch
-=========================================================
-
-## Requirements
-Built artifacts should be in ./dockerfiles/run/guice/destination folder.
-If you haven't already:
-```bash
-$ docker build -t james/project dockerfiles/compilation/java-8
-$ docker run -v $HOME/.m2:/root/.m2 -v $PWD:/origin \
- -v $PWD/dockerfiles/run/guice/destination:/destination \
- -t james/project -s HEAD
-```
-
-## Howto ?
-You need a running **cassandra** in docker. To achieve this run :
-```bash
-$ docker run -d --name=cassandra cassandra:2.2.3
-```
-
-You need a running **ElasticSearch** in docker. To achieve this run :
-```bash
-$ docker run -d --name=elasticsearch elasticsearch:2.2.1
-```
-
-We need to provide the key we will use for TLS. For obvious reasons, this is not provided in this git.
-
-Copy your TLS keys to `destination/run/guice/conf/keystore` or generate it using the following command. The password must be `james72laBalle` to match default configuration.
-```bash
-$ keytool -genkey -alias james -keyalg RSA -keystore dockerfiles/run/guice/destination/conf/keystore
-```
-
-Then we need to build james container :
-```bash
-$ docker build -t james_run dockerfiles/run/guice/
-```
-
-To run this container :
-```bash
-$ docker run --hostname HOSTNAME -p "25:25" -p 80:80 -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" --link cassandra:cassandra --link elasticsearch:elasticsearch --name james_run -t james_run
-```
-
-Where :
-- HOSTNAME: is the hostname you want to give to your James container. This DNS entry will be used to send mail to your James server.
-
-You can add an optional port binding to port 8000, to expose the webadmin server. Please note that users are not authenticated on webadmin server, thus you should avoid exposing it in production.
-
-Run James with Java 6 + Spring + JPA
-====================================
-
-* Requirements
-Built artifacts should be in ./dockerfiles/run/spring/destination folder.
-
-* Howto ?
-
-We need to provide the key we will use for TLS. For obvious reasons, this is not provided in this git.
-
-Copy your TSL keys to destination/run/spring/conf/keystore or generate it using the following command. The password must be james72laBalle to match default configuration.
-$ keytool -genkey -alias james -keyalg RSA -keystore dockerfiles/run/spring/destination/conf/keystore
-
-Then we need to build james container :
-$ docker build -t james_run dockerfiles/run/spring/
-
-To run this container :
-$ docker run --hostname HOSTNAME -p "25:25" -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" --name james_run -t james_run
-
-Where :
-- HOSTNAME: is the hostname you want to give to your James container. This DNS entry will be used to send mail to your James server.
-
-
-Useful commands
-===============
-
-The base command is different whether you choose guice flavor or spring :
-
- * guice use : `docker exec james_run java -jar /root/james-cli.jar`
- * spring use : `docker exec james_run /root/james-server-app-3.0.0-beta5-SNAPSHOT/bin/james-cli.sh`
-
-** How to add a domain ?
-# Add DOMAIN to 127.0.0.1 in your host /etc/hosts
-$ <your-command-here> -h 127.0.0.1 -p 9999 adddomain DOMAIN
-
-Where :
-- DOMAIN: is the domain you want to add.
-
-** How to add a user ?
-$ <your-command-here> -h 127.0.0.1 -p 9999 adduser USER_MAIL_ADDRESS PASSWORD
-
-Where :
-- USER_MAIL_ADDRESS: is the mail address that will be used by this user.
-- PASSWORD: is the password that will be used by this user.
-
-You can then just add DOMAIN to your /etc/hosts and you can connect to your james account with for instance Thunderbird.
-
-** How to manage SIEVE scripts ?
-Each user can manage his SIEVE scripts threw the manage SIEVE mailet.
-
-To use the manage SIEVE mailet :
-
- - You need to create the user sievemanager@DOMAIN ( if you don't, the SMTP server will check the domain, recognize it, and look for an absent local user, and will generate an error ).
- - You can send Manage Sieve commands by mail to sievemanager@DOMAIN. Your subject must contain the command. Scripts needs to be added as attachments and need the ".sieve" extension.
-
-To activate a script for a user, you need the following combinaison :
-
- - PUTSCRIPT scriptname
- - SETACTIVE scriptname
-
-** I want to retrieve users and password from my previous container
-Some james data ( those non related to mailbox, eg : mail queue, domains, users, rrt, SIEVE scripts, mail repositories ) are not yet supported by our Cassandra implementation.
-
-To keep these data when you run a new container, you can mount the following volume :
- -v /root/james-server-app-3.0.0-beta5-SNAPSHOT/var:WORKDIR/destination/var
-
-Where :
-- WORKDIR: is the absolute path to your james-parent workdir.
-
-Beware : you will have concurrency issues if multiple containers are running on this single volume.
-
-Running deployement Tests
-=========================
-
-We wrote some MPT (James' Mail Protocols Tests subproject) deployement tests to validate a James
-deployement.
-
-It uses the External-James module, that uses environment variables to locate a remote
-IMAP server and run integration tests against it.
-
-For that, the target James Server needs to be configured with a domain domain and a user imapuser
-with password password. Read above documentation to see how you can do this.
-
-You have to run MPT tests inside docker. As you need to use maven, the simplest option is to
-use james/parent image, and override the entry point ( as git and maven are already configured
-there ) :
-$ docker run -t --entrypoint="/root/integration_tests.sh" -v $PWD/.m2:/root/.m2 -v $PWD:/origin james/project JAMES_IP JAMES_PORT SHA1
-
-Where :
- - JAMES_IP: IP address or DNS entry for your James server
- - JAMES_PORT: Port allocated to James' IMAP port (should be 143).
- - SHA1(optional): Branch to use in order to build integration tests or trunk
-
-
-Howto check the merge of a commit
-=================================
-
-First step, you have to build the Docker image
-$ docker build -t james/merge dockerfiles/merge
-
-In order to run the build, you have to launch the following command:
-$ docker run -v $PWD:/origin -t james/merge SHA1 RESULTING_BRANCH
-
-Where :
-- SHA1: is the given git SHA1 of the james-project repository to merge.
-- RESULTING_BRANCH: is the branch created when merging.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: Merge branch 'switch-readme-to-adoc'
Posted by ma...@apache.org.
Merge branch 'switch-readme-to-adoc'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2fda8698
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2fda8698
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2fda8698
Branch: refs/heads/master
Commit: 2fda869850d909d102b47ec6d722e9e28f24d9da
Parents: b23790e 6991e06
Author: Matthieu Baechler <ma...@linagora.com>
Authored: Mon Oct 3 09:01:06 2016 +0200
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Mon Oct 3 09:01:06 2016 +0200
----------------------------------------------------------------------
README.adoc | 282 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
README.txt | 282 -------------------------------------------------------
2 files changed, 282 insertions(+), 282 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org