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 8BFE810C9C for ; Tue, 18 Feb 2014 17:37:07 +0000 (UTC) Received: (qmail 64199 invoked by uid 500); 18 Feb 2014 17:37:02 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 64112 invoked by uid 500); 18 Feb 2014 17:37:00 -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 64024 invoked by uid 99); 18 Feb 2014 17:36:59 -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, 18 Feb 2014 17:36:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B64659298C4; Tue, 18 Feb 2014 17:36:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 18 Feb 2014 17:37:05 -0000 Message-Id: <372d728897d845f095356172fbfb2025@git.apache.org> In-Reply-To: <2bb6baa1911545399139b83bfaae3f46@git.apache.org> References: <2bb6baa1911545399139b83bfaae3f46@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] 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/57ac2f8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57ac2f8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57ac2f8a Branch: refs/heads/trunk Commit: 57ac2f8a97d03b8a702a9c98640f7786b5cfac6e Parents: ba23b82 9416baa Author: Jonathan Ellis Authored: Tue Feb 18 11:36:50 2014 -0600 Committer: Jonathan Ellis Committed: Tue Feb 18 11:36:50 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/ActiveRepairService.java | 36 +++++++++++++++++-- .../cassandra/service/StorageService.java | 17 ++++----- .../cassandra/service/StorageServiceMBean.java | 4 +-- .../org/apache/cassandra/tools/NodeProbe.java | 16 ++++----- .../org/apache/cassandra/tools/NodeTool.java | 10 ++++-- .../service/AntiEntropyServiceTestAbstract.java | 37 +++++++++++++++++--- 7 files changed, 95 insertions(+), 26 deletions(-) ----------------------------------------------------------------------