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 F3138108DF for ; Mon, 23 Jun 2014 15:31:10 +0000 (UTC) Received: (qmail 96828 invoked by uid 500); 23 Jun 2014 15:31:10 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 96731 invoked by uid 500); 23 Jun 2014 15:31:10 -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 96356 invoked by uid 99); 23 Jun 2014 15:31:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jun 2014 15:31:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 21C9E887C3B; Mon, 23 Jun 2014 15:31:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Mon, 23 Jun 2014 15:31:14 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge remote-tracking branch 'origin/trunk' into trunk Merge remote-tracking branch 'origin/trunk' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2941791a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2941791a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2941791a Branch: refs/heads/trunk Commit: 2941791a1ae997e65a6c58122d27b3e7e09591bb Parents: 6921af2 c1ce969 Author: Jonathan Ellis Authored: Mon Jun 23 10:31:04 2014 -0500 Committer: Jonathan Ellis Committed: Mon Jun 23 10:31:04 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/QueryProcessor.java | 1 + .../cql3/statements/BatchStatement.java | 91 +++++++----- .../transport/messages/BatchMessage.java | 23 +-- .../org/apache/cassandra/cql3/BatchTests.java | 145 +++++++++++++++++++ .../org/apache/cassandra/cql3/DeleteTest.java | 25 +++- 6 files changed, 225 insertions(+), 61 deletions(-) ----------------------------------------------------------------------