Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9e79bd3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9e79bd3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9e79bd3 Branch: refs/heads/trunk Commit: d9e79bd34e0b94b30eb710e81b8b3e19d4b95fc7 Parents: f5ec369 ff42012 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Fri Jun 3 11:00:14 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Fri Jun 3 11:00:14 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +-- src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9e79bd3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9e79bd3/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
