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 C2517E99C for ; Wed, 21 Nov 2012 08:14:28 +0000 (UTC) Received: (qmail 74778 invoked by uid 500); 21 Nov 2012 08:14:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 74625 invoked by uid 500); 21 Nov 2012 08:14:28 -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 74590 invoked by uid 99); 21 Nov 2012 08:14:28 -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 Nov 2012 08:14:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D210A31874C; Wed, 21 Nov 2012 08:14:27 +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: [2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2 Message-Id: <20121121081427.D210A31874C@tyr.zones.apache.org> Date: Wed, 21 Nov 2012 08:14:27 +0000 (UTC) Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3479c636 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3479c636 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3479c636 Branch: refs/heads/trunk Commit: 3479c636baee9af58b742e4af80512823f9be138 Parents: c235229 b4f2f20 Author: Sylvain Lebresne Authored: Wed Nov 21 09:14:03 2012 +0100 Committer: Sylvain Lebresne Committed: Wed Nov 21 09:14:03 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 39 +++-- .../cassandra/cql3/operations/ColumnOperation.java | 27 +--- .../cassandra/cql3/operations/ListOperation.java | 83 +++++++-- .../cassandra/cql3/operations/MapOperation.java | 24 ++- .../cassandra/cql3/operations/Operation.java | 9 +- .../cql3/operations/PreparedOperation.java | 143 +++++++++++++++ .../cassandra/cql3/operations/SetOperation.java | 44 ++++- .../cassandra/cql3/statements/UpdateStatement.java | 25 +-- 9 files changed, 298 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3479c636/CHANGES.txt ----------------------------------------------------------------------