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 D0FD811C4F for ; Thu, 14 Aug 2014 13:54:35 +0000 (UTC) Received: (qmail 20012 invoked by uid 500); 14 Aug 2014 13:54:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 19951 invoked by uid 500); 14 Aug 2014 13:54:35 -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 19811 invoked by uid 99); 14 Aug 2014 13:54:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Aug 2014 13:54:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CE9089BEE83; Thu, 14 Aug 2014 13:54:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Thu, 14 Aug 2014 13:54:37 -0000 Message-Id: In-Reply-To: <2648b07d4457476c910ba3062d252a88@git.apache.org> References: <2648b07d4457476c910ba3062d252a88@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4304b3a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4304b3a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4304b3a6 Branch: refs/heads/trunk Commit: 4304b3a6df8e10e7abd998cd79abe330607d38c2 Parents: 048f72b 1040b52 Author: Jake Luciani Authored: Thu Aug 14 09:54:22 2014 -0400 Committer: Jake Luciani Committed: Thu Aug 14 09:54:22 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/RangeStreamer.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4304b3a6/CHANGES.txt ----------------------------------------------------------------------