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 24C4111127 for ; Fri, 1 Aug 2014 16:49:23 +0000 (UTC) Received: (qmail 75469 invoked by uid 500); 1 Aug 2014 16:49:22 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 75435 invoked by uid 500); 1 Aug 2014 16:49:22 -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 75420 invoked by uid 99); 1 Aug 2014 16:49:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 16:49:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8E1C29BD99F; Fri, 1 Aug 2014 16:49:22 +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: Fri, 01 Aug 2014 16:49:23 -0000 Message-Id: <0c798244ccf941f4bb308304fc63eb24@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1 Merge branch 'cassandra-2.1.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/46973188 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46973188 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46973188 Branch: refs/heads/cassandra-2.1 Commit: 46973188cd815232c45f19605cb783fadde578e1 Parents: 6e15762 a48b3c4 Author: Jake Luciani Authored: Fri Aug 1 12:49:02 2014 -0400 Committer: Jake Luciani Committed: Fri Aug 1 12:49:02 2014 -0400 ---------------------------------------------------------------------- NEWS.txt | 2 +- src/java/org/apache/cassandra/dht/RangeStreamer.java | 4 ++-- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------