Merge branch 'cassandra-3.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/8765e6a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8765e6a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8765e6a8 Branch: refs/heads/trunk Commit: 8765e6a869f8e902a85690e1477930a640ab7f6d Parents: 50f8ac0 cf0b737 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Tue Sep 29 12:14:46 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Tue Sep 29 12:14:46 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/utils/JVMStabilityInspector.java | 4 ++++ .../apache/cassandra/utils/JVMStabilityInspectorTest.java | 9 +++++++++ 2 files changed, 13 insertions(+) ----------------------------------------------------------------------
