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/a49cf2c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a49cf2c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a49cf2c6 Branch: refs/heads/trunk Commit: a49cf2c6ccc8f269858958c86e2437429cd5ca59 Parents: b300cc4 ff170af Author: Jeff Jirsa <[email protected]> Authored: Thu Mar 2 21:37:39 2017 -0800 Committer: Jeff Jirsa <[email protected]> Committed: Thu Mar 2 21:38:14 2017 -0800 ---------------------------------------------------------------------- conf/cassandra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a49cf2c6/conf/cassandra.yaml ----------------------------------------------------------------------
