Author: jbellis
Date: Tue Jan 18 16:33:43 2011
New Revision: 1060452
URL: http://svn.apache.org/viewvc?rev=1060452&view=rev
Log:
fix rename on merge
Modified:
cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java?rev=1060452&r1=1060451&r2=1060452&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java Tue
Jan 18 16:33:43 2011
@@ -83,7 +83,7 @@ public class QueryProcessor
try
{
- rows = StorageProxy.readProtocol(commands,
select.getConsistencyLevel());
+ rows = StorageProxy.read(commands, select.getConsistencyLevel());
}
catch (TimeoutException e)
{
