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 A285E9AC6 for ; Tue, 14 Feb 2012 11:58:31 +0000 (UTC) Received: (qmail 40495 invoked by uid 500); 14 Feb 2012 11:54:39 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 26635 invoked by uid 500); 14 Feb 2012 11:52:59 -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 7111 invoked by uid 99); 14 Feb 2012 10:57:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2012 10:57:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2012 10:57:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6D8AC31FC80; Tue, 14 Feb 2012 10:57:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120214105701.6D8AC31FC80@tyr.zones.apache.org> Date: Tue, 14 Feb 2012 10:57:01 +0000 (UTC) Updated Branches: refs/heads/trunk 26e80d742 -> d19182a50 Merge branch 'cassandra-1.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/d19182a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d19182a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d19182a5 Branch: refs/heads/trunk Commit: d19182a50cb4de95ca7a4cd8b49c08ad136f337f Parents: 26e80d7 ee2a135 Author: Sylvain Lebresne Authored: Tue Feb 14 11:56:46 2012 +0100 Committer: Sylvain Lebresne Committed: Tue Feb 14 11:56:46 2012 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------