Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9fed0844 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fed0844 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fed0844 Branch: refs/heads/trunk Commit: 9fed08449db4a446ac874d14178f86d20de97b18 Parents: 1f74142 76188e9 Author: Josh McKenzie <jmcken...@apache.org> Authored: Mon Jul 11 16:30:25 2016 -0400 Committer: Josh McKenzie <jmcken...@apache.org> Committed: Mon Jul 11 16:30:25 2016 -0400 ---------------------------------------------------------------------- conf/cassandra.yaml | 6 ++++++ src/java/org/apache/cassandra/config/Config.java | 1 + .../org/apache/cassandra/config/DatabaseDescriptor.java | 10 ++++++++++ src/java/org/apache/cassandra/service/GCInspector.java | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fed0844/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
