From f4d36dbede829bd30bc40d2603cd8d6b103e541c Mon Sep 17 00:00:00 2001 From: Gary Dusbabek Date: Thu, 3 Jun 2010 14:19:59 +0000 Subject: [PATCH] merge from 0.6 git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@951008 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/thrift/CassandraServer.java | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 6db895ab2c..abc1b04aac 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -29,6 +29,7 @@ dev * retry to make streaming connections up to 8 times. (CASSANDRA-1019) * fix potential for duplicate rows seen by Hadoop jobs (CASSANDRA-1042) * reject describe_ring() calls on invalid keyspaces (CASSANDRA-1111) + * don't reject reads at CL.ALL (CASSANDRA-1152) 0.6.2 diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index e1e1d0f9c2..204f400bb9 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -95,10 +95,6 @@ public class CassandraServer implements Cassandra.Iface { throw new InvalidRequestException("Consistency level zero may not be applied to read operations"); } - if (consistency_level == ConsistencyLevel.ALL) - { - throw new InvalidRequestException("Consistency level all is not yet supported on read operations"); - } if (consistency_level == ConsistencyLevel.ANY) { throw new InvalidRequestException("Consistency level any may not be applied to read operations");