You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/06/04 03:47:04 UTC
[2/3] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15dfdef0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15dfdef0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15dfdef0
Branch: refs/heads/trunk
Commit: 15dfdef0170dad167040d236e63dd88d47920e8b
Parents: 46273c4 9982449
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Jun 4 04:43:24 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Jun 4 04:43:24 2013 +0300
----------------------------------------------------------------------
build.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15dfdef0/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 35ac747,8f87abd..46ffbb1
--- a/build.xml
+++ b/build.xml
@@@ -1053,7 -1046,9 +1053,8 @@@
<formatter type="xml" usefile="true"/>
<formatter type="brief" usefile="false"/>
<jvmarg value="-Dstorage-config=${test.conf}"/>
- <jvmarg value="-Daccess.properties=${test.conf}/access.properties"/>
<jvmarg value="-Dlog4j.configuration=log4j-junit.properties" />
+ <jvmarg value="-Djava.awt.headless=true"/>
<jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.5.jar" />
<jvmarg value="-ea"/>
<optjvmargs/>