Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 261EA9843 for ; Thu, 31 May 2012 00:37:55 +0000 (UTC) Received: (qmail 82387 invoked by uid 500); 31 May 2012 00:37:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 82366 invoked by uid 500); 31 May 2012 00:37:54 -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 82357 invoked by uid 99); 31 May 2012 00:37:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 May 2012 00:37:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 47B9718FAC; Thu, 31 May 2012 00:37:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120531003754.47B9718FAC@tyr.zones.apache.org> Date: Thu, 31 May 2012 00:37:54 +0000 (UTC) Updated Branches: refs/heads/trunk 52e09c100 -> 25c7a7147 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25c7a714 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25c7a714 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25c7a714 Branch: refs/heads/trunk Commit: 25c7a71476504d4a90b7c369cc14b523b0df8e67 Parents: 52e09c1 59f349d Author: Dave Brosius Authored: Wed May 30 20:35:33 2012 -0400 Committer: Dave Brosius Committed: Wed May 30 20:35:33 2012 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../org/apache/cassandra/cql/QueryProcessor.java | 39 +++++++++------ .../org/apache/cassandra/cql3/QueryProcessor.java | 40 +++++++++------ 3 files changed, 51 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25c7a714/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25c7a714/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25c7a714/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------