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:06 UTC
[1/5] git commit: Remove (buggy) duplicate call to Frame.release
Repository: cassandra
Updated Branches:
refs/heads/trunk 6f36ebbf9 -> d24513e04
Remove (buggy) duplicate call to Frame.release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e456f56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e456f56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e456f56
Branch: refs/heads/trunk
Commit: 2e456f56a604402a4c176c0995f62147a129149a
Parents: 5a79f56
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 13 10:18:59 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 13 10:18:59 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/FrameCompressor.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e456f56/src/java/org/apache/cassandra/transport/FrameCompressor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/FrameCompressor.java b/src/java/org/apache/cassandra/transport/FrameCompressor.java
index 8312b90..9617ec2 100644
--- a/src/java/org/apache/cassandra/transport/FrameCompressor.java
+++ b/src/java/org/apache/cassandra/transport/FrameCompressor.java
@@ -109,9 +109,6 @@ public interface FrameCompressor
{
int size = Snappy.uncompress(input, 0, input.length, output.array(), output.arrayOffset());
output.writerIndex(size);
-
- //release the old frame
- frame.release();
}
catch (final Throwable e)
{
[3/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09feef30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09feef30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09feef30
Branch: refs/heads/trunk
Commit: 09feef30bce24376e991aae706ff617939b687f5
Parents: 2e456f5 256109c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 13 14:06:10 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 13 14:06:10 2014 +0200
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09feef30/build.xml
----------------------------------------------------------------------
[5/5] git commit: Remove duplicate compiler flag
Posted by sl...@apache.org.
Remove duplicate compiler flag
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d24513e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d24513e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d24513e0
Branch: refs/heads/trunk
Commit: d24513e04630333255f82aa75fb2f7bd5afd1be7
Parents: 3b949c2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 13 14:07:00 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 13 14:07:00 2014 +0200
----------------------------------------------------------------------
build.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d24513e0/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 98da4d9..19e18b4 100644
--- a/build.xml
+++ b/build.xml
@@ -680,7 +680,6 @@
<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}">
[4/5] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@apache.org.
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}">
[2/5] git commit: Quiet the unsafe use warning during build
Posted by sl...@apache.org.
Quiet the unsafe use warning during build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/256109c3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/256109c3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/256109c3
Branch: refs/heads/trunk
Commit: 256109c34f8536f00d3bd9240ad029e9c85b550f
Parents: 453a074
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 13 14:05:41 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 13 14:05:54 2014 +0200
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/256109c3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 5cd47a6..af571ed 100644
--- a/build.xml
+++ b/build.xml
@@ -659,6 +659,7 @@
<src path="${build.src.java}"/>
<src path="${build.src.gen-java}"/>
<classpath refid="cassandra.classpath"/>
+ <compilerarg value="-XDignore.symbol.file"/>
</javac>
<antcall target="createVersionPropFile"/>
<copy todir="${build.classes.main}">