You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/08/19 19:17:58 UTC
[1/3] cassandra git commit: Re-enable brief output for junit logs
from CASSANDRA-9528
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 96d41f0e0 -> 43b18d180
refs/heads/trunk cabdb03a9 -> ceae5acd1
Re-enable brief output for junit logs from CASSANDRA-9528
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43b18d18
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43b18d18
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43b18d18
Branch: refs/heads/cassandra-3.0
Commit: 43b18d1802d90fcfaf608754c25de1ee487d8282
Parents: 96d41f0
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Aug 19 18:11:51 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Aug 19 18:11:51 2015 +0100
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/43b18d18/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8df738c..7ed90d3 100644
--- a/build.xml
+++ b/build.xml
@@ -1216,6 +1216,8 @@
<jvmarg value="-Dcassandra.test.sstableformatdevelopment=true"/>
<!-- The first time SecureRandom initializes can be slow if it blocks on /dev/random -->
<jvmarg value="-Djava.security.egd=file:/dev/urandom" />
+ <jvmarg value="-Dcassandra.testtag=@{testtag}"/>
+ <jvmarg value="-Dcassandra.keepBriefBrief=${cassandra.keepBriefBrief}" />
<optjvmargs/>
<classpath>
<path refid="cassandra.classpath" />
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ceae5acd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ceae5acd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ceae5acd
Branch: refs/heads/trunk
Commit: ceae5acd131359ab1f762a68da171ac4c2c4519a
Parents: cabdb03 43b18d1
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Aug 19 18:12:28 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Aug 19 18:12:28 2015 +0100
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[2/3] cassandra git commit: Re-enable brief output for junit logs
from CASSANDRA-9528
Posted by sa...@apache.org.
Re-enable brief output for junit logs from CASSANDRA-9528
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43b18d18
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43b18d18
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43b18d18
Branch: refs/heads/trunk
Commit: 43b18d1802d90fcfaf608754c25de1ee487d8282
Parents: 96d41f0
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Aug 19 18:11:51 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Aug 19 18:11:51 2015 +0100
----------------------------------------------------------------------
build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/43b18d18/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8df738c..7ed90d3 100644
--- a/build.xml
+++ b/build.xml
@@ -1216,6 +1216,8 @@
<jvmarg value="-Dcassandra.test.sstableformatdevelopment=true"/>
<!-- The first time SecureRandom initializes can be slow if it blocks on /dev/random -->
<jvmarg value="-Djava.security.egd=file:/dev/urandom" />
+ <jvmarg value="-Dcassandra.testtag=@{testtag}"/>
+ <jvmarg value="-Dcassandra.keepBriefBrief=${cassandra.keepBriefBrief}" />
<optjvmargs/>
<classpath>
<path refid="cassandra.classpath" />