You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/10/21 04:28:22 UTC

[1/2] git commit: remove dead static noop method

Updated Branches:
  refs/heads/cassandra-2.0 d00a2336b -> 1187c7aa0


remove dead static noop method


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df188cc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df188cc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df188cc8

Branch: refs/heads/cassandra-2.0
Commit: df188cc8d286b3ad17e21332dd5633d9f974108e
Parents: 9afac24
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Oct 20 22:24:40 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Oct 20 22:24:40 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/TokenSerializer.java | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df188cc8/src/java/org/apache/cassandra/gms/TokenSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/TokenSerializer.java b/src/java/org/apache/cassandra/gms/TokenSerializer.java
index cc7f177..ddc1730 100644
--- a/src/java/org/apache/cassandra/gms/TokenSerializer.java
+++ b/src/java/org/apache/cassandra/gms/TokenSerializer.java
@@ -59,9 +59,4 @@ public class TokenSerializer
         }
         return tokens;
     }
-
-    public static long serializedSize(Collection<Token> tokens, TypeSizes typeSizes)
-    {
-        throw new UnsupportedOperationException();
-    }
 }
\ No newline at end of file


[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1187c7aa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1187c7aa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1187c7aa

Branch: refs/heads/cassandra-2.0
Commit: 1187c7aa0aa609cfef1a15227d55b8c46eb59633
Parents: d00a233 df188cc
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Oct 20 22:25:15 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Oct 20 22:25:15 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/TokenSerializer.java | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1187c7aa/src/java/org/apache/cassandra/gms/TokenSerializer.java
----------------------------------------------------------------------