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/98cc1ee0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98cc1ee0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98cc1ee0 Branch: refs/heads/trunk Commit: 98cc1ee0994060ca136bc0db968fa4fdf3d772bd Parents: 6292aaa e2ad7d5 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Sun Aug 9 09:41:44 2015 +0200 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Sun Aug 9 09:41:44 2015 +0200 ---------------------------------------------------------------------- .../cassandra/service/CassandraDaemon.java | 8 + .../cassandra/utils/JVMStabilityInspector.java | 9 +- .../org/apache/cassandra/db/CommitLogTest.java | 161 ++++++++++++++++++- .../apache/cassandra/utils/KillerForTests.java | 11 +- 4 files changed, 184 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
