You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/10/05 21:35:32 UTC

git commit: Amend HBASE-12160 Make Surefire's argLine configurable in the command line; Fix merge error

Repository: hbase
Updated Branches:
  refs/heads/0.98 a62fbab6f -> de27e18eb


Amend HBASE-12160 Make Surefire's argLine configurable in the command line; Fix merge error


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/de27e18e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/de27e18e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/de27e18e

Branch: refs/heads/0.98
Commit: de27e18ebcde66dad8760596fd08dc74dccee764
Parents: a62fbab
Author: Andrew Purtell <ap...@apache.org>
Authored: Sun Oct 5 12:33:40 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Sun Oct 5 12:33:40 2014 -0700

----------------------------------------------------------------------
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/de27e18e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5f18d02..ee5ca59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -510,7 +510,6 @@
               using method parallelization class ! -->
             <testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore>
             <forkedProcessTimeoutInSeconds>${surefire.timeout}</forkedProcessTimeoutInSeconds>
-            <argLine>-enableassertions -Xmx1900m -XX:MaxPermSize=100m -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true</argLine>
             <argLine>${hbase-surefire.argLine}</argLine>
             <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
           </configuration>