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 A541810DDD for ; Tue, 8 Mar 2016 09:42:39 +0000 (UTC) Received: (qmail 81760 invoked by uid 500); 8 Mar 2016 09:42:38 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 81667 invoked by uid 500); 8 Mar 2016 09:42: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 81195 invoked by uid 99); 8 Mar 2016 09:42:38 -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; Tue, 08 Mar 2016 09:42:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0364E03C0; Tue, 8 Mar 2016 09:42:37 +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: Tue, 08 Mar 2016 09:42:47 -0000 Message-Id: <7f9603ca097b40a98a03a910f351ac7d@git.apache.org> In-Reply-To: <1531813a58a64313bd1850080aaa2b10@git.apache.org> References: <1531813a58a64313bd1850080aaa2b10@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/504760c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/504760c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/504760c4 Branch: refs/heads/cassandra-3.5 Commit: 504760c464998c6d2c1b1015bb885f7921959701 Parents: 49c616c 2971ff3 Author: Sylvain Lebresne Authored: Tue Mar 8 10:41:46 2016 +0100 Committer: Sylvain Lebresne Committed: Tue Mar 8 10:41:46 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/504760c4/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java ----------------------------------------------------------------------