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 DAC5418A3E for ; Thu, 26 Nov 2015 09:43:05 +0000 (UTC) Received: (qmail 33379 invoked by uid 500); 26 Nov 2015 09:43:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 33330 invoked by uid 500); 26 Nov 2015 09:43:05 -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 33048 invoked by uid 99); 26 Nov 2015 09:43:05 -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, 26 Nov 2015 09:43:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5EB21E13D0; Thu, 26 Nov 2015 09:43:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Thu, 26 Nov 2015 09:43:08 -0000 Message-Id: <98602111db0647aaa4611899f448826d@git.apache.org> In-Reply-To: <52d218a3c2b44c8faf63f53c2c72e378@git.apache.org> References: <52d218a3c2b44c8faf63f53c2c72e378@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1 Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7ead2b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ead2b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7ead2b3 Branch: refs/heads/cassandra-3.1 Commit: b7ead2b330e8b3b3a70eaf36895fb1b7f1c6f1b2 Parents: 5fd65f3 64a3bfd Author: Sylvain Lebresne Authored: Thu Nov 26 10:42:50 2015 +0100 Committer: Sylvain Lebresne Committed: Thu Nov 26 10:42:50 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ead2b3/CHANGES.txt ----------------------------------------------------------------------