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