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 9789E10D2F for ; Sun, 9 Mar 2014 03:24:50 +0000 (UTC) Received: (qmail 68364 invoked by uid 500); 9 Mar 2014 03:24:50 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 67884 invoked by uid 500); 9 Mar 2014 03:24:48 -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 67364 invoked by uid 99); 9 Mar 2014 03:24:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Mar 2014 03:24:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 68A5093B332; Sun, 9 Mar 2014 03:24:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Sun, 09 Mar 2014 03:24:46 -0000 Message-Id: In-Reply-To: <02a48e19c7c54053b954cb81ff2fd09f@git.apache.org> References: <02a48e19c7c54053b954cb81ff2fd09f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] 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/baa2b692 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/baa2b692 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/baa2b692 Branch: refs/heads/trunk Commit: baa2b692db781c46170b707cdc5cafd033ac42b0 Parents: 572d328 5310f26 Author: Dave Brosius Authored: Sat Mar 8 22:23:41 2014 -0500 Committer: Dave Brosius Committed: Sat Mar 8 22:23:41 2014 -0500 ---------------------------------------------------------------------- NEWS.txt | 19 +++++++++++++++++++ debian/changelog | 6 ++++++ .../org/apache/cassandra/tools/NodeProbe.java | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/baa2b692/NEWS.txt ----------------------------------------------------------------------