Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbaa88d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbaa88d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbaa88d6 Branch: refs/heads/trunk Commit: bbaa88d681e31c1890c89a6ac2e0a1a92d09e110 Parents: 9e2c7f0 fd5b1de Author: Sam Tunnicliffe <[email protected]> Authored: Tue Jan 5 10:45:59 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Tue Jan 5 10:45:59 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StartupChecks.java | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
