merge from 0.6

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@951008 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Dusbabek 2010-06-03 14:19:59 +00:00
parent 24372e1de1
commit f4d36dbede
2 changed files with 1 additions and 4 deletions

View File

@ -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

View File

@ -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");