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 0100417D5C for ; Fri, 6 Nov 2015 11:02:32 +0000 (UTC) Received: (qmail 4940 invoked by uid 500); 6 Nov 2015 11:02:27 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 4879 invoked by uid 500); 6 Nov 2015 11:02:27 -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 4698 invoked by uid 99); 6 Nov 2015 11:02:27 -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, 06 Nov 2015 11:02:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8D5EE0216; Fri, 6 Nov 2015 11:02:26 +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: Fri, 06 Nov 2015 11:02:27 -0000 Message-Id: <09eca3183c5e43dea5881376a09fedce@git.apache.org> In-Reply-To: <168667fcdefb40a095a8bc967dcc43de@git.apache.org> References: <168667fcdefb40a095a8bc967dcc43de@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/2f7bab99 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f7bab99 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f7bab99 Branch: refs/heads/trunk Commit: 2f7bab995480611079c0c318b4d599239d5278cc Parents: 9280273 dc7e840 Author: Aleksey Yeschenko Authored: Fri Nov 6 11:02:23 2015 +0000 Committer: Aleksey Yeschenko Committed: Fri Nov 6 11:02:23 2015 +0000 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/DropTypeStatement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------