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/be2cf1af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be2cf1af Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be2cf1af Branch: refs/heads/trunk Commit: be2cf1afa75acfe9c2ce385a69f471d4770c56bb Parents: 1b876bc 242b973 Author: Robert Stupp <[email protected]> Authored: Wed Nov 4 23:30:01 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Wed Nov 4 23:30:01 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 +- bin/cassandra | 49 ++++++++++++++++++++ conf/cassandra-env.sh | 49 -------------------- .../apache/cassandra/service/StartupChecks.java | 19 +++++++- 4 files changed, 68 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be2cf1af/CHANGES.txt ----------------------------------------------------------------------
