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/11/19 03:34:23 UTC

[1/2] git commit: add missing String.format parameter

Updated Branches:
  refs/heads/cassandra-2.0 4444fd6ff -> ade99b918


add missing String.format parameter


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

Branch: refs/heads/cassandra-2.0
Commit: b678035ed1a9f0046ea16e78205996d8f58c5ecd
Parents: 1ac6019
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Nov 18 21:29:40 2013 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Nov 18 21:29:40 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/dht/Murmur3Partitioner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b678035e/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
index fe1c24f..5afa820 100644
--- a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
+++ b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
@@ -191,7 +191,7 @@ public class Murmur3Partitioner extends AbstractPartitioner<LongToken>
             }
             catch (NumberFormatException e)
             {
-                throw new IllegalArgumentException(String.format("Invalid token for Murmur3Partitioner. Got %s but expected a long value (unsigned 8 bytes integer)."));
+                throw new IllegalArgumentException(String.format("Invalid token for Murmur3Partitioner. Got %s but expected a long value (unsigned 8 bytes integer).", string));
             }
         }
     };


[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/ade99b91
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ade99b91
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ade99b91

Branch: refs/heads/cassandra-2.0
Commit: ade99b918f8902b735219f2b2434cca2cccf7698
Parents: 4444fd6 b678035
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Nov 18 21:32:46 2013 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Nov 18 21:32:46 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/dht/Murmur3Partitioner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ade99b91/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
----------------------------------------------------------------------