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/1eede6e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eede6e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1eede6e3 Branch: refs/heads/trunk Commit: 1eede6e3819088e09a859dbf90a0d26bd807de2a Parents: accf7a4 addf9c2 Author: Jonathan Ellis <[email protected]> Authored: Tue Jul 26 10:58:21 2016 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Jul 26 10:58:21 2016 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
