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 710DF1819A for ; Tue, 29 Sep 2015 16:16:39 +0000 (UTC) Received: (qmail 14891 invoked by uid 500); 29 Sep 2015 16:16:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 14800 invoked by uid 500); 29 Sep 2015 16:16:36 -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 14305 invoked by uid 99); 29 Sep 2015 16:16:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Sep 2015 16:16:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A5144E04B0; Tue, 29 Sep 2015 16:16:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Tue, 29 Sep 2015 16:16:42 -0000 Message-Id: <6649121a9ca74638a17914098b68fc6c@git.apache.org> In-Reply-To: <5251c795f752419e95c4e546563e379d@git.apache.org> References: <5251c795f752419e95c4e546563e379d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf0b737f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf0b737f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf0b737f Branch: refs/heads/cassandra-3.0 Commit: cf0b737f1f66d575d3da42f23fc4d4817fa86712 Parents: 66c185d a323641 Author: Joshua McKenzie Authored: Tue Sep 29 12:14:34 2015 -0400 Committer: Joshua McKenzie Committed: Tue Sep 29 12:14:34 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/utils/JVMStabilityInspector.java | 4 ++++ .../apache/cassandra/utils/JVMStabilityInspectorTest.java | 9 +++++++++ 2 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf0b737f/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf0b737f/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java ----------------------------------------------------------------------