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 8FD0710A32 for ; Thu, 19 Sep 2013 10:58:53 +0000 (UTC) Received: (qmail 70913 invoked by uid 500); 19 Sep 2013 10:58:53 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 70684 invoked by uid 500); 19 Sep 2013 10:58:51 -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 70662 invoked by uid 99); 19 Sep 2013 10:58:49 -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, 19 Sep 2013 10:58:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 25CA18876D8; Thu, 19 Sep 2013 10:58:49 +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 Date: Thu, 19 Sep 2013 10:58:50 -0000 Message-Id: <421b462794f34e94b3ec1ee7be53dd46@git.apache.org> In-Reply-To: <46da749d941345a4800fd47d69eb9ef9@git.apache.org> References: <46da749d941345a4800fd47d69eb9ef9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63589bac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63589bac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63589bac Branch: refs/heads/trunk Commit: 63589bac5aa70f5833ef2c821f47fc3b7739613c Parents: 54f41a9 37e9bce Author: Sylvain Lebresne Authored: Thu Sep 19 12:58:40 2013 +0200 Committer: Sylvain Lebresne Committed: Thu Sep 19 12:58:40 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 6 ++- doc/native_protocol_v2.spec | 20 +++++--- .../apache/cassandra/cql3/AbstractMarker.java | 4 +- .../org/apache/cassandra/cql3/Attributes.java | 2 +- src/java/org/apache/cassandra/cql3/Cql.g | 31 +++++++++--- src/java/org/apache/cassandra/cql3/Lists.java | 4 +- src/java/org/apache/cassandra/cql3/Maps.java | 4 +- .../org/apache/cassandra/cql3/Operation.java | 2 +- src/java/org/apache/cassandra/cql3/Sets.java | 2 +- src/java/org/apache/cassandra/cql3/Term.java | 6 +-- .../cassandra/cql3/VariableSpecifications.java | 52 ++++++++++++++++++++ .../cassandra/cql3/functions/FunctionCall.java | 9 +--- .../cql3/statements/BatchStatement.java | 4 +- .../cql3/statements/CreateTableStatement.java | 1 - .../cql3/statements/DeleteStatement.java | 4 +- .../cql3/statements/ModificationStatement.java | 10 ++-- .../cql3/statements/ParsedStatement.java | 15 ++++-- .../statements/SchemaAlteringStatement.java | 5 ++ .../cql3/statements/SelectStatement.java | 8 +-- .../cql3/statements/TruncateStatement.java | 5 ++ .../cql3/statements/UpdateStatement.java | 8 +-- .../cassandra/cql3/statements/UseStatement.java | 5 ++ 23 files changed, 150 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63589bac/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63589bac/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------