Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 98680 invoked from network); 18 Jan 2011 16:34:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Jan 2011 16:34:16 -0000 Received: (qmail 92222 invoked by uid 500); 18 Jan 2011 16:34:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 92054 invoked by uid 500); 18 Jan 2011 16:34:14 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 92045 invoked by uid 99); 18 Jan 2011 16:34:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jan 2011 16:34:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jan 2011 16:34:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3F790238896F; Tue, 18 Jan 2011 16:33:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1060452 - /cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java Date: Tue, 18 Jan 2011 16:33:44 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110118163344.3F790238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) {