Repository: oozie Updated Branches: refs/heads/master 6f5c709c6 -> 6a9c31ca6
OOZIE-1891 Parametrize surefire argLine to bump up heap memory for testing (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6a9c31ca Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6a9c31ca Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6a9c31ca Branch: refs/heads/master Commit: 6a9c31ca63e343ad9ad5452a4694691ff7741a6d Parents: 6f5c709 Author: egashira <[email protected]> Authored: Fri Oct 17 08:38:54 2014 -0700 Committer: egashira <[email protected]> Committed: Fri Oct 17 08:38:54 2014 -0700 ---------------------------------------------------------------------- pom.xml | 3 ++- release-log.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6a9c31ca/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5c8f2c4..d505916 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,7 @@ <oozie.test.forkMode>once</oozie.test.forkMode> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> + <maven.test.java.opts>-Xmx1024m -da -XX:MaxPermSize=512m</maven.test.java.opts> <oozie.data.dir>${oozie.test.dir}</oozie.data.dir> <oozie.test.db.host>localhost</oozie.test.db.host> @@ -1033,7 +1034,7 @@ <configuration> <forkMode>${oozie.test.forkMode}</forkMode> <forkedProcessTimeoutInSeconds>${test.timeout}</forkedProcessTimeoutInSeconds> - <argLine>-Xmx1024m -da -XX:MaxPermSize=512m</argLine> + <argLine>${maven.test.java.opts}</argLine> <systemPropertyVariables> <oozie.test.db.host>${oozie.test.db.host}</oozie.test.db.host> <oozie.test.config.file>${oozie.test.config.file}</oozie.test.config.file> http://git-wip-us.apache.org/repos/asf/oozie/blob/6a9c31ca/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index b5fc252..63ec6ea 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-1891 Parametrize surefire argLine to bump up heap memory for testing (ryota) OOZIE-1914 CLI should retry on timeout (puru) OOZIE-1973 ConcurrentModificationException in Sharelib service (puru) OOZIE-1728 When an ApplicationMaster restarts, it restarts the launcher job: DistCp followup (ryota)
