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 2015/03/20 02:13:23 UTC

[1/2] cassandra git commit: fix typo

Repository: cassandra
Updated Branches:
  refs/heads/trunk ce3053a23 -> 850b5d0d2


fix typo


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

Branch: refs/heads/trunk
Commit: 86b04ad0d4682bc49bd294d4d598d131f4da1158
Parents: e8276aa
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu Mar 19 21:12:25 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Thu Mar 19 21:12:25 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b04ad0/src/java/org/apache/cassandra/dht/AbstractBounds.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/AbstractBounds.java b/src/java/org/apache/cassandra/dht/AbstractBounds.java
index 6d2ee43..704d8c2 100644
--- a/src/java/org/apache/cassandra/dht/AbstractBounds.java
+++ b/src/java/org/apache/cassandra/dht/AbstractBounds.java
@@ -261,7 +261,7 @@ public abstract class AbstractBounds<T extends RingPosition<T>> implements Seria
 
     public static <T extends RingPosition<T>> Boundary<T> maxLeft(Boundary<T> left1, Boundary<T> left2)
     {
-        int c = left1.boundary.compareTo(left1.boundary);
+        int c = left1.boundary.compareTo(left2.boundary);
         if (c != 0)
             return c > 0 ? left1 : left2;
         // return the exclusive version, if either


[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

Posted by db...@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/850b5d0d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/850b5d0d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/850b5d0d

Branch: refs/heads/trunk
Commit: 850b5d0d21014df8d672bd420d7a26dd07e8f828
Parents: ce3053a 86b04ad
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu Mar 19 21:13:02 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Thu Mar 19 21:13:02 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/850b5d0d/src/java/org/apache/cassandra/dht/AbstractBounds.java
----------------------------------------------------------------------