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 2016/11/28 12:55:58 UTC
[1/2] james-project git commit: Remove mentions to trunk from README
Repository: james-project
Updated Branches:
refs/heads/master 77bb1e815 -> 538ac5171
Remove mentions to trunk from README
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/773a2c29
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/773a2c29
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/773a2c29
Branch: refs/heads/master
Commit: 773a2c299cbeeda8348fc3edee8157b56d5c0715
Parents: def450b
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Nov 28 12:00:00 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Nov 28 12:00:00 2016 +0700
----------------------------------------------------------------------
README.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/773a2c29/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
index f2ea15e..584b1a6 100644
--- a/README.adoc
+++ b/README.adoc
@@ -96,7 +96,7 @@ Where:
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.
+- SHA1 (optional): is the given git SHA1 of the james-project repository to build or master if none.
- -s option: given tests will not be played while building. Not specifying means play tests.
* Java 8
@@ -112,7 +112,7 @@ Where:
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.
+- SHA1 (optional): is the given git SHA1 of the james-project repository to build or master 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.
@@ -274,7 +274,7 @@ $ docker run -t --entrypoint="/root/integration_tests.sh" -v $PWD/.m2:/root/.m2
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
+ - SHA1(optional): Branch to use in order to build integration tests or master if none.
Howto check the merge of a commit
---------------------------------------------------------------------
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 remote-tracking branch
'benoit/correct_readme'
Posted by ro...@apache.org.
Merge remote-tracking branch 'benoit/correct_readme'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/538ac517
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/538ac517
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/538ac517
Branch: refs/heads/master
Commit: 538ac51715934bd8b58a4430ba5635e3db3b7101
Parents: 77bb1e8 773a2c2
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Mon Nov 28 13:54:37 2016 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Mon Nov 28 13:54:37 2016 +0100
----------------------------------------------------------------------
README.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org