cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Date Tue, 04 Jun 2013 01:47:04 GMT
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 <aleksey@apache.org>
Authored: Tue Jun 4 04:43:24 2013 +0300
Committer: Aleksey Yeschenko <aleksey@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/>


Mime
View raw message