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/trunk Commit: cf0b737f1f66d575d3da42f23fc4d4817fa86712 Parents: 66c185d a323641 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Tue Sep 29 12:14:34 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> 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 ----------------------------------------------------------------------
