Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/204cf347 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/204cf347 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/204cf347 Branch: refs/heads/trunk Commit: 204cf3478e76ce9c41dbb1adabc52abc7c09133a Parents: ee9fc22 18f8c2f Author: Jason Brown <jasedbr...@gmail.com> Authored: Fri Apr 1 11:33:11 2016 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Fri Apr 1 11:33:35 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/204cf347/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/204cf347/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
