Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82943d6a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82943d6a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82943d6a Branch: refs/heads/trunk Commit: 82943d6aa7564222f43e6c6f9e6d599ebd9dbbe2 Parents: 3d01e90 9a80f80 Author: Ariel Weisberg <aweisb...@apple.com> Authored: Tue Feb 14 15:12:39 2017 -0500 Committer: Ariel Weisberg <aweisb...@apple.com> Committed: Tue Feb 14 15:12:39 2017 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82943d6a/conf/cassandra.yaml ----------------------------------------------------------------------
