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 0E15917BED for ; Thu, 5 Nov 2015 11:20:16 +0000 (UTC) Received: (qmail 73406 invoked by uid 500); 5 Nov 2015 11:20:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 73366 invoked by uid 500); 5 Nov 2015 11:20:15 -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 73354 invoked by uid 99); 5 Nov 2015 11:20:15 -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; Thu, 05 Nov 2015 11:20:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9B0A8E3915; Thu, 5 Nov 2015 11:20:15 +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: Thu, 05 Nov 2015 11:20:16 -0000 Message-Id: <8dade2b505ec4db98e68cab7d56b8dbc@git.apache.org> In-Reply-To: <2d21ee83cad4467eb9bc154b11e7eb42@git.apache.org> References: <2d21ee83cad4467eb9bc154b11e7eb42@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/4effabc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4effabc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4effabc8 Branch: refs/heads/trunk Commit: 4effabc8fe842224cd8e2a846274b617d2b4a9e6 Parents: 65000b3 18e2fca Author: Aleksey Yeschenko Authored: Thu Nov 5 11:20:06 2015 +0000 Committer: Aleksey Yeschenko Committed: Thu Nov 5 11:20:06 2015 +0000 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/CQL3Type.java | 22 +++++++++++++++++--- .../apache/cassandra/schema/CQLTypeParser.java | 2 +- src/java/org/apache/cassandra/schema/Types.java | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) ----------------------------------------------------------------------