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:14:04 UTC
[1/4] git commit: Ninja: remove buggy test assertion from 2.1
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 4333976c8 -> cc18e05ce
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/cassandra-2.1
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
[3/4] git commit: Fix typo in v3 native protocol spec
Posted by ty...@apache.org.
Fix typo in v3 native protocol spec
Patch by Robert Stupp; review by Tyler Hobbs for CASSANDRA-7652
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff992442
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff992442
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff992442
Branch: refs/heads/cassandra-2.1
Commit: ff992442acd4af5ba039d433ffbedf859b4fde52
Parents: 70c72b7
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jul 30 17:13:10 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jul 30 17:13:10 2014 -0500
----------------------------------------------------------------------
doc/native_protocol_v3.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff992442/doc/native_protocol_v3.spec
----------------------------------------------------------------------
diff --git a/doc/native_protocol_v3.spec b/doc/native_protocol_v3.spec
index c26feeb..13b6ac6 100644
--- a/doc/native_protocol_v3.spec
+++ b/doc/native_protocol_v3.spec
@@ -446,7 +446,7 @@ Table of Contents
Indicates an error processing a request. The body of the message will be an
error code ([int]) followed by a [string] error message. Then, depending on
the exception, more content may follow. The error codes are defined in
- Section 8, along with their additional content if any.
+ Section 9, along with their additional content if any.
4.2.2. READY
[4/4] 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/cc18e05c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc18e05c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc18e05c
Branch: refs/heads/cassandra-2.1
Commit: cc18e05cea6d378ed0169e27bd02556543dd120d
Parents: e96b259 ff99244
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jul 30 17:13:54 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jul 30 17:13:54 2014 -0500
----------------------------------------------------------------------
doc/native_protocol_v3.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] 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/cassandra-2.1
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(-)
----------------------------------------------------------------------