cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Tue, 28 Jul 2015 15:10:53 GMT
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: fb10df212eebf5870ba93a3b9624049b8bdfbf44
Parents: 3879bfd ae179e4
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Jul 28 18:10:58 2015 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Jul 28 18:10:58 2015 +0300

----------------------------------------------------------------------
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb10df21/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index e6581ea,8d5c827..5cd8f20
--- a/build.xml
+++ b/build.xml
@@@ -1214,10 -1195,11 +1214,10 @@@
          <jvmarg value="-Xss256k"/>
          <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
          <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
 -	    <jvmarg value="-Dcassandra.test.offsetseed=@{poffset}"/>
 +        <jvmarg value="-Dcassandra.test.offsetseed=@{poffset}"/>
          <jvmarg value="-Dcassandra.test.sstableformatdevelopment=true"/>
-         <jvmarg value="-Dcassandra.testtag=@{testtag}"/> 
-         <jvmarg value="-Dcassandra.keepBriefBrief=${cassandra.keepBriefBrief}" />
 -        <jvmarg value="-Dcassandra.testtag=@{testtag}"/>
+         <!-- The first time SecureRandom initializes can be slow if it blocks on /dev/random
-->
+         <jvmarg value="-Djava.security.egd=file:/dev/urandom" />
  	<optjvmargs/>
          <classpath>
            <path refid="cassandra.classpath" />


Mime
View raw message