Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a323641e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a323641e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a323641e Branch: refs/heads/trunk Commit: a323641ef3243d193b60b92d937a7ab178b34602 Parents: 13b4bb4 39ab9e0 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Tue Sep 29 12:14:18 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Tue Sep 29 12:14:18 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/a323641e/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java ----------------------------------------------------------------------
