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 48E1E18EDC for ; Wed, 3 Feb 2016 11:14:46 +0000 (UTC) Received: (qmail 22458 invoked by uid 500); 3 Feb 2016 11:14:45 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 22387 invoked by uid 500); 3 Feb 2016 11:14:45 -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 21964 invoked by uid 99); 3 Feb 2016 11:14:44 -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; Wed, 03 Feb 2016 11:14:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4961E383A; Wed, 3 Feb 2016 11:14:44 +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: Wed, 03 Feb 2016 11:14:53 -0000 Message-Id: In-Reply-To: <2d088dd43a66440b8f68c840342f0902@git.apache.org> References: <2d088dd43a66440b8f68c840342f0902@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk Merge branch 'cassandra-3.3' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1f52e7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1f52e7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1f52e7b Branch: refs/heads/trunk Commit: f1f52e7bb88116e440582090cfce615511716f49 Parents: eef0ddf 35a7194 Author: Sylvain Lebresne Authored: Wed Feb 3 12:14:22 2016 +0100 Committer: Sylvain Lebresne Committed: Wed Feb 3 12:14:22 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++ src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------