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 C1DE6F517 for ; Wed, 21 Aug 2013 16:17:15 +0000 (UTC) Received: (qmail 38802 invoked by uid 500); 21 Aug 2013 16:17:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 38762 invoked by uid 500); 21 Aug 2013 16:17:15 -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 38745 invoked by uid 99); 21 Aug 2013 16:17:14 -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, 21 Aug 2013 16:17:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9752B8C1AED; Wed, 21 Aug 2013 16:17:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Wed, 21 Aug 2013 16:17:15 -0000 Message-Id: <54ec672c87c44acf9869d1503e4dfb0b@git.apache.org> In-Reply-To: <1b84d2294ceb4ff4b379a5b69280e734@git.apache.org> References: <1b84d2294ceb4ff4b379a5b69280e734@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/0da21de3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0da21de3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0da21de3 Branch: refs/heads/trunk Commit: 0da21de3ef67e40a42015d7f50728a3d9b5cd2fa Parents: 43105f7 b362aeb Author: Aleksey Yeschenko Authored: Wed Aug 21 19:17:01 2013 +0300 Committer: Aleksey Yeschenko Committed: Wed Aug 21 19:17:01 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 4 +- doc/cql3/CQL.textile | 9 ++- pylib/cqlshlib/cql3handling.py | 2 +- src/java/org/apache/cassandra/cql3/Cql.g | 6 +- .../apache/cassandra/cql3/QueryProcessor.java | 2 +- .../cql3/statements/ModificationStatement.java | 2 +- .../cql3/statements/SelectStatement.java | 63 ++++++++++++++++---- 8 files changed, 69 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0da21de3/CHANGES.txt ----------------------------------------------------------------------