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 0A65D200B76 for ; Mon, 15 Aug 2016 18:51:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 090CC160A8A; Mon, 15 Aug 2016 16:51:34 +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 4D2CC160AB8 for ; Mon, 15 Aug 2016 18:51:33 +0200 (CEST) Received: (qmail 79918 invoked by uid 500); 15 Aug 2016 16:51:31 -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 79527 invoked by uid 99); 15 Aug 2016 16:51:31 -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; Mon, 15 Aug 2016 16:51:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 511F4E38C2; Mon, 15 Aug 2016 16:51:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Mon, 15 Aug 2016 16:51:36 -0000 Message-Id: <52946db957df4641983888c3710b62fb@git.apache.org> In-Reply-To: <8b02b6cdd3bb44f39eea13d41f164f5a@git.apache.org> References: <8b02b6cdd3bb44f39eea13d41f164f5a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Mon, 15 Aug 2016 16:51:34 -0000 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/e6dd1524 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6dd1524 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6dd1524 Branch: refs/heads/cassandra-3.0 Commit: e6dd15245b87480cfda6b34f9834f341d161ee34 Parents: 74ac3ce 88b3cfc Author: Yuki Morishita Authored: Mon Aug 15 10:09:46 2016 -0500 Committer: Yuki Morishita Committed: Mon Aug 15 10:09:46 2016 -0500 ---------------------------------------------------------------------- .../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6dd1524/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java ----------------------------------------------------------------------