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 A074111E87 for ; Thu, 24 Jul 2014 19:06:38 +0000 (UTC) Received: (qmail 42669 invoked by uid 500); 24 Jul 2014 19:06:38 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 42560 invoked by uid 500); 24 Jul 2014 19:06:38 -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 42457 invoked by uid 99); 24 Jul 2014 19:06:38 -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, 24 Jul 2014 19:06:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 18E6B9B33DC; Thu, 24 Jul 2014 19:06:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Thu, 24 Jul 2014 19:06:40 -0000 Message-Id: <7f5a99f7f0134561b00efed40fd6b2d4@git.apache.org> In-Reply-To: <2fa364e428174dd99062fe38658ea7a9@git.apache.org> References: <2fa364e428174dd99062fe38658ea7a9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d6ea5b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d6ea5b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d6ea5b8 Branch: refs/heads/trunk Commit: 6d6ea5b8157c1a12129f03ef086e16adeb7db3a5 Parents: 16a3a37 f73a929 Author: Tyler Hobbs Authored: Thu Jul 24 14:06:25 2014 -0500 Committer: Tyler Hobbs Committed: Thu Jul 24 14:06:25 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/cql3/statements/DropIndexStatement.java | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d6ea5b8/CHANGES.txt ----------------------------------------------------------------------