Updated Branches: refs/heads/cassandra-2.0 6fe83cdac -> 09b2470b3
Make the CL native protocol code match the on in 2.0 patch by slebresne; reviewed by jasobrown for CASSANDRA-6347 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d7b5671 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d7b5671 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d7b5671 Branch: refs/heads/cassandra-2.0 Commit: 9d7b5671ff725cb5e2749bac763bc6f5f5fd99dd Parents: 4c08800 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Nov 15 15:36:22 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Nov 15 15:36:22 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/ConsistencyLevel.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d7b5671/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 39a88f8..9ee6657 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -18,6 +18,8 @@ * Fix missing one row in reverse query (CASSANDRA-6330) * Fix reading expired row value from row cache (CASSANDRA-6325) * Fix AssertionError when doing set element deletion (CASSANDRA-6341) + * Make CL code for the native protocol match the one in C* 2.0 + (CASSANDRA-6347) 1.2.11 http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d7b5671/src/java/org/apache/cassandra/db/ConsistencyLevel.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ConsistencyLevel.java b/src/java/org/apache/cassandra/db/ConsistencyLevel.java index 25fb25b..4d72767 100644 --- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java +++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java @@ -48,7 +48,7 @@ public enum ConsistencyLevel ALL (5), LOCAL_QUORUM(6, true), EACH_QUORUM (7), - LOCAL_ONE (8, true); + LOCAL_ONE (10, true); private static final Logger logger = LoggerFactory.getLogger(ConsistencyLevel.class);