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 512981764D for ; Fri, 18 Sep 2015 10:50:20 +0000 (UTC) Received: (qmail 62473 invoked by uid 500); 18 Sep 2015 10:50:10 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 62370 invoked by uid 500); 18 Sep 2015 10:50: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 62238 invoked by uid 99); 18 Sep 2015 10:50:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Sep 2015 10:50:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2D9B9DFE20; Fri, 18 Sep 2015 10:50:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Fri, 18 Sep 2015 10:50:11 -0000 Message-Id: <80a55c66e337480594afa698b0c4fcb7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.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/bb826240 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb826240 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb826240 Branch: refs/heads/trunk Commit: bb826240b8e4521d53718126a80da12fc9c83d05 Parents: 46c0a55 106b1cd Author: Sam Tunnicliffe Authored: Fri Sep 18 11:48:45 2015 +0100 Committer: Sam Tunnicliffe Committed: Fri Sep 18 11:48:45 2015 +0100 ---------------------------------------------------------------------- ...core-3.0.0-alpha3-7b60bed-SNAPSHOT-shaded.jar | Bin 2217129 -> 0 bytes ...core-3.0.0-alpha3-b6aa814-SNAPSHOT-shaded.jar | Bin 0 -> 2217119 bytes .../cql3/statements/AlterViewStatement.java | 7 +++---- .../cql3/statements/CreateIndexStatement.java | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) ----------------------------------------------------------------------