Merge branch 'cassandra-3.0' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f3e07a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f3e07a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f3e07a0 Branch: refs/heads/cassandra-3.X Commit: 2f3e07a0ad0f92f5646a532f2f2a54e87171a9cc Parents: 5e9d9eb d532686 Author: Sam Tunnicliffe <[email protected]> Authored: Mon Nov 14 12:49:04 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Mon Nov 14 12:49:04 2016 +0000 ---------------------------------------------------------------------- conf/cassandra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f3e07a0/conf/cassandra.yaml ----------------------------------------------------------------------
