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 2016/11/23 23:40:00 UTC
[1/4] cassandra git commit: fix SyncRequest.equals wrt ranges
Repository: cassandra
Updated Branches:
refs/heads/trunk ac2a0a5f8 -> df84bdf5c
fix SyncRequest.equals wrt ranges
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55e8f518
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55e8f518
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55e8f518
Branch: refs/heads/trunk
Commit: 55e8f5185194044a5c734d4a664a0f1f274ac9a3
Parents: d152745
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Nov 23 18:31:25 2016 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Nov 23 18:31:25 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/55e8f518/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
index f79f482..e31cc6c 100644
--- a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
@@ -69,7 +69,7 @@ public class SyncRequest extends RepairMessage
initiator.equals(req.initiator) &&
src.equals(req.src) &&
dst.equals(req.dst) &&
- ranges.equals(ranges);
+ ranges.equals(req.ranges);
}
@Override
[4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df84bdf5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df84bdf5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df84bdf5
Branch: refs/heads/trunk
Commit: df84bdf5c3fad20170b21b2a3c7d4507daef93c4
Parents: ac2a0a5 6854191
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Nov 23 18:39:43 2016 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Nov 23 18:39:43 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] cassandra git commit: fix SyncRequest.equals wrt ranges
Posted by db...@apache.org.
fix SyncRequest.equals wrt ranges
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/595f1da9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/595f1da9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/595f1da9
Branch: refs/heads/trunk
Commit: 595f1da9ef11c92419add15df7c8172c54fd1dbc
Parents: 9cc0c80
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Nov 23 18:37:56 2016 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Nov 23 18:37:56 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/595f1da9/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
index f79f482..e31cc6c 100644
--- a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
@@ -69,7 +69,7 @@ public class SyncRequest extends RepairMessage
initiator.equals(req.initiator) &&
src.equals(req.src) &&
dst.equals(req.dst) &&
- ranges.equals(ranges);
+ ranges.equals(req.ranges);
}
@Override
[3/4] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by db...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68541919
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68541919
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68541919
Branch: refs/heads/trunk
Commit: 685419194c6d329d4e9d7eff9aac6938d615ea49
Parents: 55e8f51 595f1da
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Nov 23 18:38:40 2016 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Nov 23 18:38:40 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------