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 <[email protected]> Authored: Mon Nov 28 12:00:00 2016 +0700 Committer: Benoit Tellier <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
