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 24FF311DC1 for ; Tue, 8 Apr 2014 22:14:09 +0000 (UTC) Received: (qmail 20437 invoked by uid 500); 8 Apr 2014 22:14:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 20163 invoked by uid 500); 8 Apr 2014 22:14:07 -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 19883 invoked by uid 99); 8 Apr 2014 22:14:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Apr 2014 22:14:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 21C1794EB03; Tue, 8 Apr 2014 22:14:03 +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: Tue, 08 Apr 2014 22:14:06 -0000 Message-Id: <3679049eafd04645b2256b4e4f85f9fb@git.apache.org> In-Reply-To: <73af15bc65d7422fb336055cbd27d67c@git.apache.org> References: <73af15bc65d7422fb336055cbd27d67c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5541352f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5541352f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5541352f Branch: refs/heads/trunk Commit: 5541352f1b78e7c49a8af997a7878b6d9717f486 Parents: da2acdd b1a3070 Author: Yuki Morishita Authored: Tue Apr 8 17:13:40 2014 -0500 Committer: Yuki Morishita Committed: Tue Apr 8 17:13:40 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5541352f/src/java/org/apache/cassandra/streaming/StreamTransferTask.java ----------------------------------------------------------------------