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/06cd4e82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06cd4e82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06cd4e82 Branch: refs/heads/trunk Commit: 06cd4e824539e266305733e5b3ffee65e42fe602 Parents: d6daf1b 68580c7 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed May 4 18:02:49 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed May 4 18:02:49 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/06cd4e82/CHANGES.txt ----------------------------------------------------------------------
