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 B44481860A for ; Fri, 27 Nov 2015 12:17:51 +0000 (UTC) Received: (qmail 57051 invoked by uid 500); 27 Nov 2015 12:17:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 57023 invoked by uid 500); 27 Nov 2015 12:17:51 -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 56744 invoked by uid 99); 27 Nov 2015 12:17:51 -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; Fri, 27 Nov 2015 12:17:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4DE1DE041F; Fri, 27 Nov 2015 12:17:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Fri, 27 Nov 2015 12:17:53 -0000 Message-Id: <5ca33e508d5642a0a9ba3970732e73e3@git.apache.org> In-Reply-To: <0f18d5af8e0d4677af7e966f9ddeb182@git.apache.org> References: <0f18d5af8e0d4677af7e966f9ddeb182@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/17e13e5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17e13e5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17e13e5c Branch: refs/heads/cassandra-3.1 Commit: 17e13e5cf5aaf45c403a96de8d38cda091c20d2e Parents: 21a7a1c c35af2a Author: Benjamin Lerer Authored: Fri Nov 27 13:17:29 2015 +0100 Committer: Benjamin Lerer Committed: Fri Nov 27 13:17:46 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17e13e5c/CHANGES.txt ----------------------------------------------------------------------