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 8B7EE105BE for ; Tue, 24 Sep 2013 13:41:37 +0000 (UTC) Received: (qmail 49985 invoked by uid 500); 24 Sep 2013 13:41:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49939 invoked by uid 500); 24 Sep 2013 13:41:34 -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 49894 invoked by uid 99); 24 Sep 2013 13:41:34 -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, 24 Sep 2013 13:41:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 86BD4908728; Tue, 24 Sep 2013 13:41:33 +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, 24 Sep 2013 13:41:38 -0000 Message-Id: <4aac71db18e64fb7ab83d7be398446a5@git.apache.org> In-Reply-To: <776aa35ef9c34fb48ab643c785911f2f@git.apache.org> References: <776aa35ef9c34fb48ab643c785911f2f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/99691be1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99691be1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99691be1 Branch: refs/heads/trunk Commit: 99691be14f0bfcba71a2b75343332126c6e749e8 Parents: 08e3346 7c6e552 Author: Jonathan Ellis Authored: Tue Sep 24 08:41:23 2013 -0500 Committer: Jonathan Ellis Committed: Tue Sep 24 08:41:23 2013 -0500 ---------------------------------------------------------------------- src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------