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 24DD2118CB for ; Wed, 14 May 2014 23:26:51 +0000 (UTC) Received: (qmail 21483 invoked by uid 500); 10 May 2014 21:59:34 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 79540 invoked by uid 500); 10 May 2014 21:57:10 -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 59855 invoked by uid 99); 10 May 2014 21:56:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B0282988E0F; Fri, 9 May 2014 15:41:57 +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: Fri, 09 May 2014 15:42:00 -0000 Message-Id: In-Reply-To: <6ac2588e0c304bf3a960ddb05ad01472@git.apache.org> References: <6ac2588e0c304bf3a960ddb05ad01472@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/7f3d07ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f3d07ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f3d07ac Branch: refs/heads/trunk Commit: 7f3d07ac02178c3d3012557f4df18fe116e5ec11 Parents: 361ad68 7484bd4 Author: Yuki Morishita Authored: Fri May 9 10:41:36 2014 -0500 Committer: Yuki Morishita Committed: Fri May 9 10:41:36 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/streaming/StreamSession.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f3d07ac/src/java/org/apache/cassandra/streaming/StreamSession.java ----------------------------------------------------------------------