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 5F2EA105F6 for ; Thu, 3 Oct 2013 17:13:06 +0000 (UTC) Received: (qmail 26612 invoked by uid 500); 3 Oct 2013 17:12:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 26418 invoked by uid 500); 3 Oct 2013 17:12:54 -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 26340 invoked by uid 99); 3 Oct 2013 17:12:52 -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, 03 Oct 2013 17:12:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B889C90EAF1; Thu, 3 Oct 2013 17:12:51 +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: Thu, 03 Oct 2013 17:12:52 -0000 Message-Id: In-Reply-To: <5a59a3f289534c86bee415d39a9c1a27@git.apache.org> References: <5a59a3f289534c86bee415d39a9c1a27@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/11] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecfb403d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecfb403d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecfb403d Branch: refs/heads/trunk Commit: ecfb403da94efe161348ad85de45166b766673fb Parents: db82949 55a5500 Author: Jonathan Ellis Authored: Thu Oct 3 09:53:14 2013 -0500 Committer: Jonathan Ellis Committed: Thu Oct 3 09:53:14 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeCmd.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ----------------------------------------------------------------------