Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48bfc8e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48bfc8e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48bfc8e8 Branch: refs/heads/trunk Commit: 48bfc8e8dcd926ea547211fd959cebba8c0e027b Parents: 3f3db2d 23a1dee Author: Ariel Weisberg <[email protected]> Authored: Tue Feb 14 15:14:15 2017 -0500 Committer: Ariel Weisberg <[email protected]> Committed: Tue Feb 14 15:14:15 2017 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48bfc8e8/conf/cassandra.yaml ----------------------------------------------------------------------
