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 F0ED411FF9 for ; Mon, 5 May 2014 16:53:39 +0000 (UTC) Received: (qmail 26776 invoked by uid 500); 5 May 2014 16:53:30 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 26732 invoked by uid 500); 5 May 2014 16:53:29 -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 26566 invoked by uid 99); 5 May 2014 16:53:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 May 2014 16:53:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3DE739115BD; Mon, 5 May 2014 16:53:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Mon, 05 May 2014 16:53:37 -0000 Message-Id: <7d0d880e8a424c3a9fb1ce5d36df496d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/12] 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/949c5dae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/949c5dae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/949c5dae Branch: refs/heads/trunk Commit: 949c5daea34d25487f42951df95d9a3ef5410fc7 Parents: ddd2ff7 b622411 Author: Brandon Williams Authored: Mon May 5 11:49:34 2014 -0500 Committer: Brandon Williams Committed: Mon May 5 11:49:34 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../service/ScheduledRangeTransferExecutorService.java | 6 +++--- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/949c5dae/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/949c5dae/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------