Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18f8c2fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18f8c2fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18f8c2fe Branch: refs/heads/trunk Commit: 18f8c2feab449d7e202f877f6fdd6c3cb9d6bcaa Parents: 020a80b d3f6f94 Author: Jason Brown <jasedbr...@gmail.com> Authored: Fri Apr 1 11:32:12 2016 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Fri Apr 1 11:32:43 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/18f8c2fe/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/18f8c2fe/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
