You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/05/13 14:07:09 UTC
[4/5] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b949c2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b949c2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b949c2d
Branch: refs/heads/trunk
Commit: 3b949c2d1c12db917e7da1604782c798c114e633
Parents: 6f36ebb 09feef3
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 13 14:06:25 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 13 14:06:25 2014 +0200
----------------------------------------------------------------------
build.xml | 1 +
src/java/org/apache/cassandra/transport/FrameCompressor.java | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b949c2d/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 19e18b4,fa3b5ca..98da4d9
--- a/build.xml
+++ b/build.xml
@@@ -678,8 -692,8 +678,9 @@@
destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}">
<src path="${build.src.java}"/>
<src path="${build.src.gen-java}"/>
+ <compilerarg value="-XDignore.symbol.file"/>
<classpath refid="cassandra.classpath"/>
+ <compilerarg value="-XDignore.symbol.file"/>
</javac>
<antcall target="createVersionPropFile"/>
<copy todir="${build.classes.main}">