Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1103f5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1103f5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1103f5a Branch: refs/heads/trunk Commit: d1103f5ab96f732489711903228de7106d0d80a0 Parents: 7c68abc 46da70e Author: Robert Stupp <sn...@snazy.de> Authored: Thu Nov 19 10:42:19 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Nov 19 10:42:19 2015 +0100 ---------------------------------------------------------------------- conf/cassandra.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
