You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/07/31 00:04:42 UTC
[1/3] git commit: Ninja: remove buggy test assertion from 2.1
Repository: cassandra
Updated Branches:
refs/heads/trunk c37322097 -> fec97df34
Ninja: remove buggy test assertion from 2.1
This was fixed by CASSANDRA-7390, but that fix starts with Cassandra
3.0.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70c72b7e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70c72b7e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70c72b7e
Branch: refs/heads/trunk
Commit: 70c72b7ec56367f9701ccf971363fc179bf2db50
Parents: 08fd11d
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jul 30 17:02:10 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jul 30 17:03:03 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/MoveTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/70c72b7e/test/unit/org/apache/cassandra/service/MoveTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/MoveTest.java b/test/unit/org/apache/cassandra/service/MoveTest.java
index a3fd89c..b802b11 100644
--- a/test/unit/org/apache/cassandra/service/MoveTest.java
+++ b/test/unit/org/apache/cassandra/service/MoveTest.java
@@ -137,7 +137,8 @@ public class MoveTest
numMoved++;
}
}
- assertEquals("mismatched number of moved token", numMoved, 1);
+ // This assertion isn't reliable in 2.1. See CASSANDRA-7390
+ // assertEquals("mismatched number of moved token", numMoved, 1);
}
// moving endpoint back to the normal state
[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1.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/e96b2597
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e96b2597
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e96b2597
Branch: refs/heads/trunk
Commit: e96b25977ab38456eebd1d4a2d28c3dc95e45940
Parents: 4333976 70c72b7
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jul 30 17:03:24 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jul 30 17:03:24 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/MoveTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/unit/org/apache/cassandra/service/MoveTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fec97df3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fec97df3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fec97df3
Branch: refs/heads/trunk
Commit: fec97df341507eeb23ab396a2f24b006994f8584
Parents: c373220 e96b259
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jul 30 17:04:30 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jul 30 17:04:30 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------