Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5B99A200D5E for ; Thu, 9 Nov 2017 19:11:25 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5A3A41609C8; Thu, 9 Nov 2017 18:11:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D1793160C04 for ; Thu, 9 Nov 2017 19:11:24 +0100 (CET) Received: (qmail 8769 invoked by uid 500); 9 Nov 2017 18:11:23 -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 8379 invoked by uid 99); 9 Nov 2017 18:11:23 -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, 09 Nov 2017 18:11:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CC414DFF15; Thu, 9 Nov 2017 18:11:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bdeggleston@apache.org To: commits@cassandra.apache.org Date: Thu, 09 Nov 2017 18:11:27 -0000 Message-Id: <6a517aa166a04e768c14a5b222c5bcc9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk archived-at: Thu, 09 Nov 2017 18:11:25 -0000 Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7707b736 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7707b736 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7707b736 Branch: refs/heads/trunk Commit: 7707b736cd216a59f29dccdbabbb8398df95e020 Parents: ec62822 387d3a4 Author: Blake Eggleston Authored: Thu Nov 9 10:08:06 2017 -0800 Committer: Blake Eggleston Committed: Thu Nov 9 10:08:06 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707b736/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707b736/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org