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/46da70e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46da70e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46da70e1 Branch: refs/heads/cassandra-3.0 Commit: 46da70e1fc363a1a343831504de601aa8d56223f Parents: 74070ee 4e48324 Author: Robert Stupp <sn...@snazy.de> Authored: Thu Nov 19 10:42:11 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Nov 19 10:42:11 2015 +0100 ---------------------------------------------------------------------- conf/cassandra.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46da70e1/conf/cassandra.yaml ----------------------------------------------------------------------
