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 2679EDEEE for ; Wed, 12 Sep 2012 19:21:18 +0000 (UTC) Received: (qmail 94380 invoked by uid 500); 12 Sep 2012 19:21:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 94359 invoked by uid 500); 12 Sep 2012 19:21:18 -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 94351 invoked by uid 99); 12 Sep 2012 19:21:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Sep 2012 19:21:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A501E35EE0; Wed, 12 Sep 2012 19:21:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix parsing of consistency ALL in CQL3 Message-Id: <20120912192117.A501E35EE0@tyr.zones.apache.org> Date: Wed, 12 Sep 2012 19:21:17 +0000 (UTC) Updated Branches: refs/heads/trunk 1e126dada -> 8edf6a619 Fix parsing of consistency ALL in CQL3 patch by slebresne; reviewed by xedin for CASSANDRA-4659 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8edf6a61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8edf6a61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8edf6a61 Branch: refs/heads/trunk Commit: 8edf6a6192ca201e5c2ef84452a21b8de2b953df Parents: 1e126da Author: Sylvain Lebresne Authored: Wed Sep 12 21:20:36 2012 +0200 Committer: Sylvain Lebresne Committed: Wed Sep 12 21:20:36 2012 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Cql.g | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8edf6a61/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g index 79c5b9f..01dbafd 100644 --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@ -752,11 +752,10 @@ K_UPDATE: U P D A T E; K_WITH: W I T H; K_LIMIT: L I M I T; K_USING: U S I N G; -K_ALL: A L L; K_CONSISTENCY: C O N S I S T E N C Y; K_LEVEL: ( O N E | Q U O R U M - | K_ALL + | A L L | A N Y | L O C A L '_' Q U O R U M | E A C H '_' Q U O R U M